fh-wfm-workorder-angular
Advanced tools
Comparing version 0.2.3 to 0.2.5-pre.1
@@ -96,6 +96,6 @@ var ngModule; | ||
' <md-input-container class="md-block" flex-gt-sm>\n' + | ||
' <label for="inputFinishDate">Finish Date</label>\n' + | ||
' <input type="date" id="inputFinishDate" name="finishDate" min="{{today}}" max="{{maxDate}}" ng-model="ctrl.model.finishDate" required>\n' + | ||
' <div ng-messages="workorderForm.finishDate.$error" ng-show="ctrl.submitted || workorderForm.finishDate.$dirty">\n' + | ||
' <div ng-message="required">A finish date is required.</div>\n' + | ||
' <label for="inputStartDate">Start Date</label>\n' + | ||
' <input type="date" id="inputStartDate" name="startDate" min="{{today}}" max="{{maxDate}}" ng-model="ctrl.model.startDate" required>\n' + | ||
' <div ng-messages="workorderForm.startDate.$error" ng-show="ctrl.submitted || workorderForm.startDate.$dirty">\n' + | ||
' <div ng-message="required">A start date is required.</div>\n' + | ||
' <div ng-message="min">Start Date should not be less than current date.</div>\n' + | ||
@@ -106,6 +106,6 @@ ' <div ng-message="max">Start Date is too far in the future.</div>\n' + | ||
' <md-input-container class="md-block" flex-gt-sm>\n' + | ||
' <label for="inputFinishTime" >Finish Time</label>\n' + | ||
' <input type="time" id="inputFinishTime" name="finishTime" ng-model="ctrl.model.finishTime" required>\n' + | ||
' <div ng-messages="workorderForm.finishTime.$error" ng-show="ctrl.submitted || workorderForm.finishTime.$dirty">\n' + | ||
' <div ng-message="required">A finish time is required.</div>\n' + | ||
' <label for="inputStartTime" >Start Time</label>\n' + | ||
' <input type="time" id="inputStartTime" name="startTime" ng-model="ctrl.model.startTime" required>\n' + | ||
' <div ng-messages="workorderForm.startTime.$error" ng-show="ctrl.submitted || workorderForm.startTime.$dirty">\n' + | ||
' <div ng-message="required">A start time is required.</div>\n' + | ||
' </div>\n' + | ||
@@ -115,2 +115,21 @@ ' </md-input-container>\n' + | ||
'\n' + | ||
'<div layout-gt-sm="row">\n' + | ||
' <md-input-container class="md-block" flex-gt-sm>\n' + | ||
' <label for="inputFinishDate">Finish Date</label>\n' + | ||
' <input type="date" id="inputFinishDate" name="finishDate" min="{{today}}" max="{{maxDate}}" ng-model="ctrl.model.finishDate" required>\n' + | ||
' <div ng-messages="workorderForm.finishDate.$error" ng-show="ctrl.submitted || workorderForm.finishDate.$dirty">\n' + | ||
' <div ng-message="required">A finish date is required.</div>\n' + | ||
' <div ng-message="min">Finish Date should not be less than current date.</div>\n' + | ||
' <div ng-message="max">Finish Date is too far in the future.</div>\n' + | ||
' </div>\n' + | ||
' </md-input-container>\n' + | ||
' <md-input-container class="md-block" flex-gt-sm>\n' + | ||
' <label for="inputFinishTime" >Finish Time</label>\n' + | ||
' <input type="time" id="inputFinishTime" name="finishTime" ng-model="ctrl.model.finishTime" required>\n' + | ||
' <div ng-messages="workorderForm.finishTime.$error" ng-show="ctrl.submitted || workorderForm.finishTime.$dirty">\n' + | ||
' <div ng-message="required">A finish time is required.</div>\n' + | ||
' </div>\n' + | ||
' </md-input-container>\n' + | ||
'</div>\n' + | ||
'\n' + | ||
'<div>\n' + | ||
@@ -117,0 +136,0 @@ ' <md-input-container class="md-block" ng-class="{ \'has-error\' : workorderForm.summary.$invalid && !workorderForm.summary.$pristine }">\n' + |
@@ -56,3 +56,3 @@ var ngModule; | ||
' <h3>{{workorder.startTimestamp | date:\'yyyy-MM-dd\' }}</h3>\n' + | ||
' <p>Finish Date</p>\n' + | ||
' <p>Start Date</p>\n' + | ||
' </div>\n' + | ||
@@ -66,2 +66,20 @@ ' </md-list-item>\n' + | ||
' <h3>{{workorder.startTimestamp | date:\'HH:mm:ss Z\' }}</h3>\n' + | ||
' <p>Start Time</p>\n' + | ||
' </div>\n' + | ||
' </md-list-item>\n' + | ||
' <md-divider></md-divider>\n' + | ||
'\n' + | ||
' <md-list-item class="md-2-line" ng-if="workorder.finishTimestamp">\n' + | ||
' <md-icon md-font-set="material-icons">event</md-icon>\n' + | ||
' <div class="md-list-item-text">\n' + | ||
' <h3>{{workorder.finishTimestamp | date:\'yyyy-MM-dd\' }}</h3>\n' + | ||
' <p>Finish Date</p>\n' + | ||
' </div>\n' + | ||
' </md-list-item>\n' + | ||
' <md-divider></md-divider>\n' + | ||
'\n' + | ||
' <md-list-item class="md-2-line" ng-if="workorder.finishTimestamp" >\n' + | ||
' <md-icon md-font-set="material-icons">schedule</md-icon>\n' + | ||
' <div class="md-list-item-text">\n' + | ||
' <h3>{{workorder.finishTimestamp | date:\'HH:mm:ss Z\' }}</h3>\n' + | ||
' <p>Finish Time</p>\n' + | ||
@@ -68,0 +86,0 @@ ' </div>\n' + |
@@ -29,3 +29,3 @@ var CONSTANTS = require('../constants'); | ||
//If there is a workorder ID in the state URL, then we are editing a worokorder, otherwise we are creating a new one. | ||
var workorderPromise = $stateParams.workorderId ? workorderMediatorService.readWorkorder($stateParams.workorderId) : $q.when({}); | ||
var workorderPromise = $stateParams.workorderId ? workorderMediatorService.readWorkorder($stateParams.workorderId) : $q.when({location: []}); | ||
var workflowsPromise = workorderMediatorService.listWorkflows(); | ||
@@ -44,15 +44,17 @@ var workersPromise = workorderMediatorService.listUsers(); | ||
//TODO: Should reaally be a service | ||
self.done = function(isValid) { | ||
self.submitted = true; | ||
if (isValid) { | ||
self.model.startTimestamp = new Date(self.model.finishDate); // TODO: incorporate self.model.finishTime | ||
self.model.startTimestamp = new Date(self.model.startDate); | ||
self.model.startTimestamp.setHours( | ||
self.model.startTime.getHours(), | ||
self.model.startTime.getMinutes(), | ||
self.model.startTime.getSeconds() | ||
); | ||
self.model.finishTimestamp = new Date(self.model.finishDate); | ||
self.model.finishTimestamp.setHours( | ||
self.model.finishTime.getHours(), | ||
self.model.finishTime.getMinutes(), | ||
self.model.finishTime.getSeconds(), | ||
self.model.finishTime.getMilliseconds() | ||
self.model.finishTime.getSeconds() | ||
); | ||
self.model.finishDate = new Date(self.model.startTimestamp); | ||
self.model.finishTime = new Date(self.model.startTimestamp); | ||
var workorderToCreate = JSON.parse(angular.toJson(self.model)); | ||
@@ -83,4 +85,8 @@ | ||
if (self.model && self.model.startTimestamp) { | ||
self.model.finishDate = new Date(self.model.startTimestamp); | ||
self.model.finishTime = new Date(self.model.startTimestamp); | ||
self.model.startDate = new Date(self.model.startTimestamp); | ||
self.model.startTime = new Date(self.model.startTimestamp); | ||
self.model.startTime.setMilliseconds(0); | ||
self.model.finishDate = new Date(self.model.finishTimestamp); | ||
self.model.finishTime = new Date(self.model.finishTimestamp); | ||
self.model.finishTime.setMilliseconds(0); | ||
} | ||
@@ -87,0 +93,0 @@ }); |
{ | ||
"name": "fh-wfm-workorder-angular", | ||
"version": "0.2.3", | ||
"version": "0.2.5-pre.1", | ||
"description": "Angular UI Implementation of Workorders", | ||
@@ -5,0 +5,0 @@ "main": "lib/workorder-ng.js", |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
76203
1374