atlanticbiomedical/biomedjs
1
0
Fork 0
mirror of https://github.com/atlanticbiomedical/biomedjs.git synced 2025-07-02 00:47:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

latest changes

Browse Source
This commit is contained in:
Dobie Wollert
2015-07-26 03:46:43 -04:00
parent 24f4acc1d3
commit 3964ec1321
7 changed files with 90 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/controllers/workorders.js
View File

@ -76,7 +76,8 @@ module.exports = function(config, calendar) {
status: req.body.status,
scheduling: req.body.scheduling,
techs: req.body.techs,
alternativeContact: req.body.alternativeContact
alternativeContact: req.body.alternativeContact,
trackingNumber: req.body.trackingNumber
});
var notify = req.body._notify || "";
@ -239,7 +240,7 @@ module.exports = function(config, calendar) {
workorder.checkNumber = req.body.checkNumber;
workorder.paidOn = req.body.paidOn;
workorder.alternativeContact = req.body.alternativeContact;
workorder.trackingNumber = req.body.trackingNumber;
callback(err);
});
},

3
app/model/workorder.js
View File

@ -29,7 +29,8 @@ var workorderSchema = new Schema({
invoicedOn: Date,
checkNumber: String,
paidOn: Date,
alternativeContact: String
alternativeContact: String,
trackingNumber: String
});
module.exports = mongoose.model('Workorder', workorderSchema);

6
public/js/controllers.js
View File

@ -1148,12 +1148,16 @@ angular.module('biomed')
$scope.workorderType = 'pm';
} else if (search.workorderType == "meeting") {
$scope.model.reason = "Meeting";
$scope.workorderType = 'meeting';
$scope.model.status = 'n/a';
$scope.workorderType = 'meeting';
if (search.clientId) {
$scope.model.client = search.clientId;
}
} else if (search.workorderType == 'shipment') {
$scope.model.reason = 'Shipment';
$scope.model.status = 'scheduled';
$scope.workorderType = 'shipment';
} else {
if (search.clientId) {
$scope.model.client = search.clientId;

7
public/partials/schedule/index.html
View File

@ -10,10 +10,11 @@
<div class="toolbelt">
<a href="/workorders/add" class="btn btn-primary" ng-show="accountHasPermission('system.edit')">Work Order</a>
<a href="/workorders/add?workorderType=meeting" class="btn" ng-show="accountHasPermission('system.edit')">Meeting</a>
<a href="/workorders/add?workorderType=shipment" class="btn" ng-show="accountHasPermission('system.edit')">Shipment</a>
<div class="pull-right">
<span class="toolbelt-text">Group: </span>
<div class="input-append">
<select ng-model="group" name="group" class="input-medium">
<span class="toolbelt-text">Group: </span>
<div class="input-append">
<select ng-model="group" name="group" class="input-medium">
<option ng-repeat="(key, value) in TECH_GROUPS" value="{{key}}">{{value}}</option>
</select>
<span class="add-on"><i class="icon-calendar"></i></span>

36
public/partials/workorders/add.html
View File

@ -1,12 +1,14 @@
<ul class="breadcrumb">
<li><a href="/clients"><i class="icon-briefcase"></i> Workorders</a><span class="divider"></span><li>
<li ng-hide="loading || workorderType == 'meeting'" class="active">New Workorder<li>
<li ng-hide="loading || workorderType == 'meeting' || workorderType == 'shipment'" class="active">New Workorder<li>
<li ng-hide="loading || workorderType != 'meeting'" class="active">New Meeting</li>
<li ng-hide="loading || workorderType != 'shipment'" class="active">New Shipment</li>
</ul>
<header>
<h1 ng-show="workorderType != 'meeting'">New Workorder</h1>
<h1 ng-show="workorderType != 'meeting' && workorderType != 'shipment'">New Workorder</h1>
<h1 ng-show="workorderType == 'meeting'">New Meeting</h1>
<h1 ng-show="workorderType == 'shipment'">New Shipment</h1>
</header>
<div class="form">
<div class="form-section">
@ -39,13 +41,13 @@
<label class="control-label">Tech Notes</label>
<div class="controls">{{currentClient.notes['tech']}}</div>
</div>
<div class="control-group">
<div class="control-group" ng-show="workorderType != 'shipment'">
<label class="control-label">Additional E-Mails</label>
<div class="controls">
<input type="text" ui-select2="emailsOptions" ng-model="model.emails" class="input-xxlarge" />
</div>
</div>
<div class="control-group">
<div class="control-group" ng-show="workorderType != 'shipment'">
<label class="control-label">Alternative Contact</label>
<div class="controls">
<input ng-model="model.alternativeContact" type="text" class="input-large">
@ -62,7 +64,7 @@
<div class="control-group">
<label class="control-label">Reason</label>
<div class="controls">
<select ng-model="model.reason" name="reason" class="input-xlarge" ng-disabled="{{workorderType == 'pm' || workorderType == 'meeting'}}">
<select ng-model="model.reason" name="reason" class="input-xlarge" ng-disabled="{{workorderType == 'pm' || workorderType == 'meeting' || workorderType == 'shipment'}}">
<option value="Add New Equipment">Add New Equipment</option>
<option value="As Directed">As Directed</option>
<option value="Autoclave Repair">Autoclave Repair</option>
@ -77,6 +79,7 @@
<option value="Preventive Maintenance">Preventive Maintenance</option>
<option value="Printer Failure">Printer Failure</option>
<option value="Repair">Repair</option>
<option value="Shipment">Shipment</option>
</select>
</div>
</div>
@ -113,7 +116,7 @@
</div>
</div>
</div>
<div class="form-section">
<div class="form-section" ng-show="workorderType != 'shipment'">
<div class="section-label">Scheduling</div>
<div class="section-container">
<div class="form-editor">
@ -296,11 +299,30 @@
</div>
</div>
</div>
<div class="form-section" ng-show="workorderType == 'shipment'">
<div class="section-label">Shipment Details</div>
<div class="section-container">
<div class="form-editor">
<div class="control-group">
<label class="control-label">Date Shipped</label>
<div class="controls">
<span><input ng-model="picker.startDate" datepicker type="text" class="input-small"></span>
</div>
</div>
<div class="control-group">
<label class="control-label">Tracking Number</label>
<div class="controls">
<span><input ng-model="model.trackingNumber" type="text" class="input-small"></span>
</div>
</div>
</div>
</div>
</div>
<div class="form-section">
<div class="section-label">&nbsp;</div>
<div class="section-container">
<button ng-disabled="!model.client" ng-click="save(false)" type="button" class="btn btn-primary">Save</button>
<button ng-disabled="!model.client" ng-click="save(true)" type="button" class="btn">Save & Notify</button>
<button ng-disabled="!model.client" ng-click="save(true)" ng-show="workorderType != 'shipment'" type="button" class="btn">Save & Notify</button>
</div>
</div>
</div>

46
public/partials/workorders/edit.html
View File

@ -21,7 +21,7 @@
</div>
</form>
<div class="form-section">
<div class="form-section" ng-show="master.reason != 'Shipment'">
<div class="section-label">Additional Contact Information</div>
<div class="section-container">
<div ng-hide="emails.visible" class="form-preview">
@ -63,7 +63,7 @@
<div class="control-group">
<label class="control-label">Reason</label>
<div class="controls">
<select ng-model="remarks.model.reason" name="reason" class="input-xlarge">
<select ng-model="remarks.model.reason" name="reason" class="input-xlarge" ng-disabled="master.reason == 'Shipment' || master.reason == 'Meeting'">
<option value="Add New Equipment">Add New Equipment</option>
<option value="As Directed">As Directed</option>
<option value="Autoclave Repair">Autoclave Repair</option>
@ -78,6 +78,7 @@
<option value="Preventive Maintenance">Preventive Maintenance</option>
<option value="Printer Failure">Printer Failure</option>
<option value="Repair">Repair</option>
<option value="Shipment">Shipment</option>
</select>
</div>
</div>
@ -114,13 +115,13 @@
</div>
<div class="form-actions">
<button ng-click="remarks.save(false)" type="button" class="btn btn-primary">Save</button>
<button ng-click="remarks.save(true)" type="button" class="btn">Save & Notify</button>
<button ng-click="remarks.save(true)" ng-show="master.reason != 'Shipment'" type="button" class="btn">Save & Notify</button>
<button ng-click="remarks.reset()" type="button" class="btn">Cancel</button>
</div>
</div>
</div>
</div>
<div class="form-section">
<div class="form-section" ng-show="master.reason != 'Shipment'">
<div class="section-label">Scheduling</div>
<div class="section-container">
<div ng-hide="scheduling.visible" class="form-preview">
@ -313,6 +314,35 @@
</div>
</div>
</div>
<div class="form-section" ng-show="master.reason == 'Shipment'">
<div class="section-label">Shipment Details</div>
<div class="section-container">
<div ng-hide="scheduling.visible" class="form-preview">
Shipped <strong>{{master.scheduling.start | date }}</strong><br>
Tracking Number: <strong><a ng-href="https://www.fedex.com/apps/fedextrack/?action=track&tracknumbers={{master.trackingNumber}}" target="new">{{master.trackingNumber}}</a></strong><br>
<a ng-click="scheduling.edit()" ng-show="accountHasPermission('system.edit')">Edit</a>
</div>
<div ng-show="scheduling.visible" class="form-editor">
<div class="control-group">
<label class="control-label">Shipping Date</label>
<div class="controls">
<span><input ng-model="scheduling.startDate" datepicker type="text" class="input-small"></span>
</div>
</div>
<div class="control-group">
<label class="control-label">Tracking Number</label>
<div class="controls">
<span><input ng-model="scheduling.model.trackingNumber" type="text" class="input-small"></span>
</div>
</div>
<div class="form-actions">
<button ng-click="scheduling.save(false)" type="button" class="btn btn-primary">Save</button>
<button ng-click="scheduling.reset()" type="button" class="btn">Cancel</button>
</div>
</div>
</div>
</div>
<form name="form" class="form-section" style="margin-bottom: 0">
<div class="section-label">Billing</div>
<div class="section-container">
@ -336,7 +366,7 @@
</div>
<div class="form-actions">
<button ng-disabled="form.$invalid" ng-click="status.save(false)" type="button" class="btn btn-primary">Save</button>
<button ng-disabled="form.$invalid" ng-click="status.save(true)" type="button" class="btn">Save & Notify</button>
<button ng-disabled="form.$invalid" ng-click="status.save(true)" ng-show="master.reason != 'Shipment'" type="button" class="btn">Save & Notify</button>
<button ng-click="status.reset()" type="button" class="btn">Cancel</button>
</div>
</div>
@ -345,7 +375,11 @@
<div class="form-section">
<div class="section-label">Other</div>
<div class="section-container">
<button ng-click="destroy()" type="button" class="btn btn-danger">Remove <span ng-show="workorderType != 'meeting'">workorder</span><span ng-show="workorderType == 'meeting'">meeting</span></button>
<button ng-click="destroy()" type="button" class="btn btn-danger">Remove
<span ng-show="master.reason != 'Meeting' && master.reason != 'Shipment'">workorder</span>
<span ng-show="master.reason == 'Meeting'">meeting</span>
<span ng-show="master.reason == 'Shipment'">shipment</soan>
</button>
</div>
</div>
</div>

9
public/partials/workorders/index.html
View File

@ -40,8 +40,13 @@
<tr ng-hide="loading" ng-repeat="workorder in workorders | orderBy : sort.column : sort.descending">
<td>
<a ng-href="/workorders/{{workorder._id}}">#{{workorder.biomedId}} - {{workorder.reason}}</a><br>
<strong>Techs:</strong> {{ workorder.techs | techs }}<br>
{{workorder.remarks}}
<span ng-show="workorder.reason != 'Shipment'">
<strong>Techs:</strong> {{ workorder.techs | techs }}<br>
{{workorder.remarks}}
</span>
<span ng-show="workorder.reason == 'Shipment'">
<strong>Tracking Number:</strong> {{workorder.trackingNumber}}
</span>
</td>
<td><a ng-href="/clients/{{workorder.client._id}}">{{workorder.client.name}} ({{workorder.client.identifier}})</a></td>
<td>{{workorder.scheduling.start | date}}</td>