fh-wfm-workorder-angular
Advanced tools
Comparing version 0.2.0-2 to 0.2.0-alpha.1
@@ -26,9 +26,2 @@ var ngModule; | ||
'\n' + | ||
' <!--\n' + | ||
' <md-input-container>\n' + | ||
' <label for="workorderState">Status</label>\n' + | ||
' <input type="text" id="inputWorkorderType" name="workorderStatus" ng-model="ctrl.model.status" disabled="true">\n' + | ||
' </md-input-container>\n' + | ||
' -->\n' + | ||
'\n' + | ||
'<div layout-gt-sm="row">\n' + | ||
@@ -35,0 +28,0 @@ ' <md-input-container class="md-block" flex-gt-sm>\n' + |
@@ -30,10 +30,3 @@ var ngModule; | ||
' >\n' + | ||
'<!--\n' + | ||
' TODO: change class name according to the color:\n' + | ||
' "success" = green\n' + | ||
' danger = "red"\n' + | ||
' warning = "yellow"\n' + | ||
' no class = grey\n' + | ||
' -->\n' + | ||
' <workorder-status class="" status="ctrl.resultMap[workorder.id].status"></workorder-status>\n' + | ||
' <workorder-status ng-class="ctrl.getColorIcon(workorder)" status="ctrl.resultMap[workorder.id].status"></workorder-status>\n' + | ||
'\n' + | ||
@@ -40,0 +33,0 @@ ' <div class="md-list-item-text">\n' + |
@@ -38,3 +38,3 @@ var ngModule; | ||
' <md-card-content>\n' + | ||
' <p class="md-body-1" ng-if="! ctrl.result.stepResults || ctrl.result.stepResults | isEmpty">\n' + | ||
' <p class="md-body-1" ng-if="! ctrl.result.stepResults || ctrl.result.stepResults || isEmpty">\n' + | ||
' No workflow submissions.\n' + | ||
@@ -41,0 +41,0 @@ ' </p>\n' + |
@@ -22,3 +22,3 @@ var ngModule; | ||
' <md-icon>\n' + | ||
' <workorder-status status="status"></workorder-status>\n' + | ||
' <workorder-status ng-class="ctrl.getColorIcon(status)" status="status"></workorder-status>\n' + | ||
' </md-icon>\n' + | ||
@@ -25,0 +25,0 @@ ' <div class="md-list-item-text">\n' + |
@@ -10,2 +10,3 @@ var CONSTANTS = require('../constants'); | ||
*/ | ||
var statusIconColor = require('../workorder-status/workorder-status-directive.js'); | ||
function WorkorderDetailController(mediator, WORKORDER_CONFIG) { | ||
@@ -26,2 +27,6 @@ var self = this; | ||
}; | ||
self.getColorIcon = function(status) { | ||
return statusIconColor.getStatusIconColor(status).statusColor; | ||
}; | ||
} | ||
@@ -28,0 +33,0 @@ |
@@ -12,2 +12,5 @@ var CONSTANTS = require('../constants'); | ||
*/ | ||
var statusIconColor = require('../workorder-status/workorder-status-directive.js'); | ||
function WorkorderListController(mediator, workorderMediatorService, $q) { | ||
@@ -42,4 +45,13 @@ var self = this; | ||
}; | ||
self.getColorIcon = function(workorder) { | ||
var result = this.resultMap[workorder.id]; | ||
if (!result) { | ||
return statusIconColor.getStatusIconColor('').statusColor; | ||
} else { | ||
return statusIconColor.getStatusIconColor(this.resultMap[workorder.id].status).statusColor; | ||
} | ||
}; | ||
} | ||
angular.module(CONSTANTS.WORKORDER_DIRECTIVE).controller('WorkorderListController', ['mediator', 'workorderMediatorService', '$q', WorkorderListController]); |
var CONSTANTS = require('../constants'); | ||
var getStatusIcon = function(status) { | ||
var getStatusIconColor = function(status) { | ||
var statusIcon; | ||
var statusColor; | ||
switch (status) { | ||
case 'In Progress': | ||
statusIcon = 'autorenew'; | ||
statusColor = 'warning'; | ||
break; | ||
case 'Complete': | ||
statusIcon = 'assignment_turned_in'; | ||
statusColor = 'success'; | ||
break; | ||
case 'Aborted': | ||
statusIcon = 'assignment_late'; | ||
statusColor = 'danger'; | ||
break; | ||
case 'On Hold': | ||
statusIcon = 'pause'; | ||
statusColor = 'warning'; | ||
break; | ||
case 'Unassigned': | ||
statusIcon = 'assignment_ind'; | ||
statusColor = 'warning'; | ||
break; | ||
case 'New': | ||
statusIcon = 'new_releases'; | ||
statusColor = ''; | ||
break; | ||
default: | ||
statusIcon = 'radio_button_unchecked'; | ||
statusColor = ''; | ||
} | ||
return statusIcon; | ||
return { | ||
statusIcon: statusIcon, | ||
statusColor: statusColor | ||
}; | ||
}; | ||
@@ -38,3 +49,3 @@ | ||
, controller: function($scope) { | ||
$scope.statusIcon = getStatusIcon($scope.status); | ||
$scope.statusIcon = getStatusIconColor($scope.status).statusIcon; | ||
} | ||
@@ -41,0 +52,0 @@ , controllerAs: 'ctrl' |
@@ -19,3 +19,2 @@ var CONSTANTS = require('../constants'); | ||
return $q.when(workorderMediatorService.resultMap().then(function(resultMap) { | ||
console.log("resultMap", resultMap); | ||
return resultMap[workorder.id]; | ||
@@ -26,3 +25,3 @@ })); | ||
var workerPromise = workorderPromise.then(function(workorder) { | ||
return workorderMediatorService.readUser(workorder.assignee); | ||
return workorder && workorder.assignee ? workorderMediatorService.readUser(workorder.assignee) : $q.when(null); | ||
}); | ||
@@ -32,3 +31,2 @@ | ||
$q.all([workorderPromise, workflowPromise, resultPromise, workerPromise]).then(function(results) { | ||
console.log("All Done", results); | ||
self.workorder = results[0]; | ||
@@ -35,0 +33,0 @@ self.workflow = results[1]; |
{ | ||
"name": "fh-wfm-workorder-angular", | ||
"version": "0.2.0-2", | ||
"version": "0.2.0-alpha.1", | ||
"description": "Angular UI Implementation of Workorders", | ||
@@ -33,2 +33,3 @@ "main": "lib/workorder-ng.js", | ||
"chai": "^3.5.0", | ||
"eslint": "^3.17.1", | ||
"fh-wfm-template-build": "0.2.1", | ||
@@ -40,3 +41,2 @@ "grunt": "1.0.1", | ||
"mocha": "3.2.0", | ||
"nsp": "2.6.2", | ||
"request": "2.69.0", | ||
@@ -43,0 +43,0 @@ "should": "8.3.0", |
Sorry, the diff of this file is not supported yet
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
New author
Supply chain riskA new npm collaborator published a version of the package for the first time. New collaborators are usually benign additions to a project, but do indicate a change to the security surface area of a package.
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
70053
1290
1