mirror of
https://github.com/atlanticbiomedical/biomedjs.git
synced 2025-07-02 00:47:26 -04:00
latest changes
This commit is contained in:
Dobie Wollert
@ -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"> </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>
|
||||
|
||||
@ -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>
|
||||
|
||||
@ -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>
|
||||
|
||||
Reference in New Issue
Block a user