Latest batch of work

This commit is contained in:
Dobie Wollert
2015-04-06 06:36:17 -04:00
parent d3089dcd17
commit 8cfff70ce0
11 changed files with 218 additions and 24 deletions

View File

@ -0,0 +1,59 @@
<ul class="breadcrumb">
<li><a href="/clients"><i class="icon-wrench"></i> Accounting</a><li>
</ul>
<h1>Accounting</h1>
<div class="row-fluid">
<div class="span12">
<div class="toolbelt">
<div class="pull-left">
<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 class="pull-right">
<span class="toolbelt-text">Start: </span>
<div class="input-append">
<input ng-model="start" datepicker type="text" class="input-medium">
<span class="add-on"><i class="icon-calendar"></i></span>
</div>
<span class="toolbelt-text">End: </span>
<div class="input-append">
<input ng-model="end" datepicker type="text" class="input-medium">
<span class="add-on"><i class="icon-calendar"></i></span>
</div>
</div>
</div>
<table class="biomed-table" infinite-scroll="addItems()" can-load="canLoad" threshold="300">
<thead>
<tr>
<th style="width: 20%" ng-class="selectedCls('biomedId')" ng-click="changeSorting('biomedId')">Workorder</th>
<th style="width: 30%" ng-class="selectedCls('client.name')" ng-click="changeSorting('client.name')">Client</th>
<th style="width: 10%" ng-class="selectedCls('scheduling.start')" ng-click="changeSorting('scheduling.start')">Date</th>
<th style="width: 10%" ng-class="selectedCls('invoiceNumber')" ng-click="changeSorting('invoiceNumber')">Invoice #</th>
<th style="width: 10%" ng-class="selectedCls('invoicedOn')" ng-click="changeSorting('invoicedOn')">Invoice Date</th>
<th style="width: 10%" ng-class="selectedCls('checkNumber')" ng-click="changeSorting('checkNumber')">Check #</th>
<th style="width: 10%" ng-class="selectedCls('paidOn')" ng-click="changeSorting('paidOn')">Paid Date</th>
<th style="width: 10%" ng-class="selectedCls('status')" ng-click="changeSorting('status')">Status</th>
</tr>
</thead>
<tbody>
<tr ng-show="loading"><td colspan="8" class="table-loading"><i class="loader"></i></td></tr>
<tr ng-hide="loading || workorders.length"><td colspan="8" class="table-message">There is no information to display.</td></tr>
<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>
</td>
<td><a ng-href="/clients/{{workorder.client._id}}">{{workorder.client.name}} ({{workorder.client.identifier}})</a></td>
<td>{{workorder.scheduling.start | date}}</td>
<td>{{workorder.invoiceNumber}}</td>
<td>{{workorder.invoicedOn | date}}</td>
<td>{{workorder.checkNumber}}</td>
<td>{{workorder.paidOn | date}}</td>
<td>{{workorder.status}}</td>
</tr>
</tbody>
</table>
</div>
</div>

View File

@ -10,7 +10,6 @@
<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="/schedule/pms" class="btn">View PMs</a>
<div class="pull-right">
<span class="toolbelt-text">Group: </span>
<div class="input-append">

View File

@ -33,8 +33,8 @@
<table class="biomed-table" infinite-scroll="addItems()" can-load="canLoad" threshold="300">
<thead>
<tr>
<th style="width: 48%" ng-class="selectedCls('client.name')" ng-click="changeSorting('client.name')">Client Name</th>
<th style="width: 20%" ng-class="selectedCls('reason')" ng-click="changeSorting('reason')">Reason</th>
<th style="width: 18%" ng-class="selectedCls('client.name')" ng-click="changeSorting('client.name')">Client Name</th>
<th style="width: 50%" ng-class="selectedCls('reason')" ng-click="changeSorting('reason')">Frequency</th>
<th style="width: 20%" ng-class="selectedCls('client.contacts[0].name')" ng-click="changeSorting('client.contacts[0].name')">Contact</th>
<th style="width: 12%" ng-class="selectedCls('client.contacts[0].phone')" ng-click="changeSorting('client.contacts[0].phone')">Phone</th>
</tr>
@ -43,8 +43,12 @@
<tr ng-show="loading"><td colspan="4" class="table-loading"><i class="loader"></i></td></tr>
<tr ng-hide="loading || pms.length"><td colspan="4" class="table-message">There is no information to display.</td></tr>
<tr ng-hide="loading" ng-repeat="pm in pms | orderBy : sort.column : sort.descending">
<td><a ng-href="/workorders/add?workorderType=pm&amp;clientId={{pm.client._id}}&amp;type={{pm.reason}}">{{pm.client.name}} ({{pm.client.identifier | uppercase}})</a><br>
<td>{{pm.reason}}</td>
<td colspan="2">
{{pm.client.name}} ({{pm.client.identifier | uppercase}})<br>
<span ng-repeat="reason in pm.reason">
<a ng-href="/workorders/add?workorderType=pm&amp;clientId={{pm.client._id}}&amp;type={{reason}}">{{reason}}</a><span ng-show="!$last">, </span>
</span>
</td>
<td>{{pm.client.contacts[0].name}}</td>
<td>{{pm.client.contacts[0].phone}}</td>
</tr>

View File

@ -47,6 +47,12 @@
<input type="text" ui-select2="emailsOptions" ng-model="model.emails" class="input-xxlarge" />
</div>
</div>
<div class="control-group">
<label class="control-label">Alternative Contact</label>
<div class="controls">
<input ng-model="model.alternativeContact" type="text" class="input-large">
</div>
</div>
</div>
</div>
</div>

View File

@ -12,7 +12,7 @@
<div ng-hide="loading" class="tabbable">
<div class="tab-content">
<div class="tab-pane active form" title="Details">
<div class="form-section">
<form name="form" class="form-section" style="margin-bottom: 0">
<div class="section-label">Status</div>
<div class="section-container">
<div ng-hide="status.visible" class="form-preview">
@ -32,20 +32,33 @@
</select>
</div>
</div>
<div class="control-group" ng-show="status.model.status == 'invoiced' || status.model.status == 'paid'">
<label class="control-label">Invoice Number</label>
<div class="controls">
<input ng-model="status.model.invoiceNumber" type="text" class="input-small" ng-required="status.model.status == 'invoiced' || status.model.status == 'paid'">
</div>
</div>
<div class="control-group" ng-show="status.model.status == 'paid'">
<label class="control-label">Check Number</label>
<div class="controls">
<input ng-model="status.model.checkNumber" type="text" class="input-small" ng-required="status.model.status == 'paid'">
</div>
</div>
<div class="form-actions">
<button ng-click="status.save(false)" type="button" class="btn btn-primary">Save</button>
<button ng-click="status.save(true)" type="button" class="btn">Save & Notify</button>
<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-click="status.reset()" type="button" class="btn">Cancel</button>
</div>
</div>
</div>
</div>
</form>
<div class="form-section">
<div class="section-label">Additional E-Mails</div>
<div class="section-label">Additional Contact Information</div>
<div class="section-container">
<div ng-hide="emails.visible" class="form-preview">
<span ng-repeat="email in master.emails"><b>{{email}}</b><span ng-show="!$last">, </span></span>
<span ng-show"master.emails" ng-repeat="email in master.emails"><b>{{email}}</b><span ng-show="!$last">, </span></span>
<span ng-show="master.alternativeContact">{{master.alternativeContact}}<br></span>
<a ng-click="emails.edit()" ng-class="{disabled: editing}" ng-show="accountHasPermission('system.edit')">Edit</a>
</div>
<div ng-show="emails.visible" class="form-editor">
@ -55,6 +68,12 @@
<input type="text" ui-select2="emailsOptions" ng-model="emails.model.emails" class="input-xxlarge" />
</div>
</div>
<div class="control-group">
<label class="control-label">Alternative Contact</label>
<div class="controls">
<input ng-model="emails.model.alternativeContact" type="text" class="input-large">
</div>
</div>
<div class="form-actions">
<button ng-click="emails.save(false)" type="button" class="btn btn-primary">Save</button>
<button ng-click="emails.save(true)" type="button" class="btn">Save & Notify</button>