latest changes

This commit is contained in:
Dobie Wollert
2015-07-19 21:31:10 -04:00
parent 4496b9c240
commit 24f4acc1d3
15 changed files with 671 additions and 13 deletions

View File

@ -6,8 +6,8 @@
<header ng-hide="loading">
<h1>{{master.name}}</h1>
<p class="lead">{{master.identifier}}</p>
<a class="btn btn-primary" href="/workorders/add?clientId={{master._id}}" ng-show="accountHasPermission('system.edit')">Create new Workorder</a>
<a class="btn" href="/workorders/add?workorderType=meeting&clientId={{master._id}}" ng-show="accountHasPermission('system.edit')">Create new Meeting</a>
<a class="btn btn-primary" href="/workorders/add?clientId={{master._id}}" ng-show="accountHasPermission('system.edit')">Work Order</a>
<a class="btn" href="/workorders/add?workorderType=meeting&clientId={{master._id}}" ng-show="accountHasPermission('system.edit')">Meeting</a>
</header>
<div ng-hide="loading" class="tabbable">
<div class="tab-content">
@ -305,9 +305,7 @@
<th style="width: 8%">Purchase Date</th>
<th style="width: 6%">Warranty Expiration</th>
<th style="width: 8%">PM Test</th>
<th style="width: 4%">Room #</th>
<th style="width: 4%">PO Number</th>
<th style="width: 4%">Move to</th>
<th style="width: 4%">Location</th>
</tr>
</thead>
<tbody>
@ -322,8 +320,6 @@
<td>{{tag.data.deviceWarrantyExpiration}}</td>
<td>{{tag.data.test}}</td>
<td>{{tag.data.roomNumber}}</td>
<td>{{tag.data.poNumber}}</td>
<td>{{tag.data.MoveTo}}</td>
</tr>
</tbody>
</table>

View File

@ -0,0 +1,80 @@
<ul class="breadcrumb">
<li><a href="/devices"><i class="icon-briefcase"></i> Devices</a><span class="divider"></span><li>
<li class="active">New Device<li>
</ul>
<header>
<h1>New Device</h1>
</header>
<form name="form" class="form">
<div class="form-section">
<div class="section-label">Device Identification</div>
<div class="section-container">
<div class="form-editor">
<div class="control-group">
<label class="control-label">Device Type</label>
<div class="controls">
<input type="hidden" ng-model="deviceTypePicker" ui-select2="deviceTypeOpts" />
</div>
</div>
<div class="control-group">
<label class="control-label">Make</label>
<div class="controls">
<input type="hidden" ng-model="makePicker" ui-select2="makeOpts" />
</div>
</div>
<div class="control-group">
<label class="control-label">Model</label>
<div class="controls">
<input ng-model="model.model" type="text" class="input-xlarge">
</div>
</div>
</div>
</div>
</div>
<div class="form-section">
<div class="section-label">Device Details</div>
<div class="section-container">
<div class="form-editor">
<div class="control-group">
<label class="control-label">Technical Data</label>
<div class="controls">
<textarea ng-model="model.technicalData" type="text" class="input-xxlarge"></textarea>
</div>
</div>
<div class="control-group">
<label class="control-label">Links</label>
<div class="controls">
<textarea ng-model="model.links" type="text" class="input-xxlarge"></textarea>
</div>
</div>
<div class="control-group">
<label class="control-label">Recommended Parts</label>
<div class="controls">
<textarea ng-model="model.partsRecommended" type="text" class="input-xxlarge"></textarea>
</div>
</div>
</div>
</div>
</div>
<div class="form-section">
<div class="section-label">Images</div>
<div class="section-container">
<div class="form-editor">
<div class="control-group">
<label class="control-label">Images</label>
<div class="controls">
<div class="dropzone" dropzone="imageOpts"></div>
</div>
</div>
</div>
</div>
</div>
<div class="form-section">
<div class="section-label">&nbsp;</div>
<div class="section-container">
<button ng-click="save()" ng-disabled="form.$invalid" type="button" class="btn btn-primary">Save</button>
</div>
</div>
</form>

View File

@ -0,0 +1,80 @@
<ul class="breadcrumb">
<li><a href="/devices"><i class="icon-briefcase"></i> Devices</a><span class="divider"></span><li>
<li class="active">Edit Device<li>
</ul>
<header>
<h1>Edit Device</h1>
</header>
<form name="form" class="form">
<div class="form-section">
<div class="section-label">Device Identification</div>
<div class="section-container">
<div class="form-editor">
<div class="control-group">
<label class="control-label">Device Type</label>
<div class="controls">
<input type="hidden" ng-model="deviceTypePicker" ui-select2="deviceTypeOpts" />
</div>
</div>
<div class="control-group">
<label class="control-label">Make</label>
<div class="controls">
<input type="hidden" ng-model="makePicker" ui-select2="makeOpts" />
</div>
</div>
<div class="control-group">
<label class="control-label">Model</label>
<div class="controls">
<input ng-model="model.model" type="text" class="input-xlarge">
</div>
</div>
</div>
</div>
</div>
<div class="form-section">
<div class="section-label">Device Details</div>
<div class="section-container">
<div class="form-editor">
<div class="control-group">
<label class="control-label">Technical Data</label>
<div class="controls">
<textarea ng-model="model.technicalData" type="text" class="input-xxlarge"></textarea>
</div>
</div>
<div class="control-group">
<label class="control-label">Links</label>
<div class="controls">
<textarea ng-model="model.links" type="text" class="input-xxlarge"></textarea>
</div>
</div>
<div class="control-group">
<label class="control-label">Recommended Parts</label>
<div class="controls">
<textarea ng-model="model.partsRecommended" type="text" class="input-xxlarge"></textarea>
</div>
</div>
</div>
</div>
</div>
<div class="form-section">
<div class="section-label">Images</div>
<div class="section-container">
<div class="form-editor">
<div class="control-group">
<label class="control-label">Images</label>
<div class="controls">
<div class="dropzone" dropzone="imageOpts" existing="existingImages" prefix="devices/"></div>
</div>
</div>
</div>
</div>
</div>
<div class="form-section">
<div class="section-label">&nbsp;</div>
<div class="section-container">
<button ng-click="save()" ng-disabled="form.$invalid" type="button" class="btn btn-primary">Save</button>
</div>
</div>
</form>

View File

@ -0,0 +1,41 @@
<ul class="breadcrumb">
<li><a href="/devices"><i class="icon-briefcase"></i> Devices</a><li>
</ul>
<header>
<h1>Devices</h1>
</header>
<div class="row-fluid">
<div class="span12">
<div class="toolbelt">
<a href="/devices/add" class="btn btn-primary" ng-show="accountHasPermission('system.edit')">Create new Device</a>
<div class="pull-right">
<span class="toolbelt-text">Search:</span>
<div class="input-append">
<input type="text" ng-model="query" class="input-large" placeholder="Search">
<span class="add-on"><i class="icon-search"></i></span>
</div>
</div>
</div>
<table class="biomed-table" infinite-scroll="addItems()" can-load="canLoad" threshold="300">
<thead>
<tr>
<th style="width: 33%" ng-class="selectedCls('deviceType')" ng-click="changeSorting('deviceType')">Device Type</th>
<th style="width: 33%" ng-class="selectedCls('make')" ng-click="changeSorting('make')">Make</th>
<th style="width: 33%" ng-class="selectedCls('model')" ng-click="changeSorting('model')">Model</th>
<th></th>
</tr>
</thead>
<tbody>
<tr ng-show="loading"><td colspan="4" class="table-loading"><i class="loader"></i></td></tr>
<tr ng-hide="loading || devices.length"><td colspan="4" class="table-message">There is no information to display.</td></tr>
<tr ng-hide="loading" ng-repeat="device in devices">
<td>{{device.deviceType}}</td>
<td>{{device.make}}</td>
<td>{{device.model}}</td>
<td><a href="/devices/{{device._id}}">Edit</a></td>
</tr>
</tbody>
</table>
</div>
</div>

View File

@ -8,8 +8,8 @@
<div class="row-fluid">
<div class="span12">
<div class="toolbelt">
<a href="/workorders/add" class="btn btn-primary" ng-show="accountHasPermission('system.edit')">Create new Workorder</a>
<a href="/workorders/add?workorderType=meeting" class="btn" ng-show="accountHasPermission('system.edit')">Create new Meeting</a>
<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>
<div class="pull-right">
<span class="toolbelt-text">Group: </span>
<div class="input-append">

View File

@ -9,7 +9,7 @@
<div class="row-fluid">
<div class="span12">
<div class="toolbelt">
<a href="/clients/add" class="btn btn-primary" ng-show="accountHasPermission('system.edit')">Create new Workorder</a>
<a href="/clients/add" class="btn btn-primary" ng-show="accountHasPermission('system.edit')">Work Order</a>
<span class="toolbelt-text">Filter:</span>
<select ng-model="filter" name="filter" class="input-xlarge">
<option value="all">All</option>