Latest work

This commit is contained in:
Dobie Wollert
2015-04-19 21:15:06 -04:00
parent 8cfff70ce0
commit 397b828024
12 changed files with 200 additions and 70 deletions

View File

@ -11,8 +11,15 @@
<input type="text" ng-model="query" class="input-large" placeholder="Search">
<span class="add-on"><i class="icon-search"></i></span>
</div>
<a ng-click="selectPage()" class="btn">All</a>
<a ng-click="selectPage('scheduled')" class="btn">Scheduled</a>
<a ng-click="selectPage('invoiced')" class="btn">Invoiced</a>
<a ng-click="selectPage('paid')" class="btn">Paid</a>
</div>
<div class="pull-right">
<div class="pull-right">
<span class="toolbelt-text">Total: {{total}}</span>
</div>
<span class="toolbelt-text">Start: </span>
<div class="input-append">
<input ng-model="start" datepicker type="text" class="input-medium">
@ -32,9 +39,7 @@
<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>
@ -48,9 +53,7 @@
<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>

View File

@ -6,7 +6,7 @@
<h1>New Client</h1>
</header>
<div class="form">
<form name="form" class="form">
<div class="form-section">
<div class="section-label">Client Name</div>
<div class="section-container">
@ -17,10 +17,20 @@
<input ng-model="model.name" type="text" name="name" class="input-xlarge">
</div>
</div>
<div class="control-group">
<div
ng-class="{ 'error': form.identifier.$invalid && !form.identifier.$pristine }"
class="control-group">
<label class="control-label">Identifier</label>
<div class="controls">
<input ng-model="model.identifier" type="text" name="identifier" requiredclass="input-xlarge">
<input
ng-model="model.identifier"
required
ab-unique="{field: 'identifier'}"
type="text"
name="identifier"
class="input-xlarge">
<span ng-show="form.identifier.$error.unique" class="help-inline">Identifier must be unique</span>
</div>
</div>
</div>
@ -190,7 +200,7 @@
<div class="form-section">
<div class="section-label">&nbsp;</div>
<div class="section-container">
<button ng-click="save()" type="button" class="btn btn-primary">Save</button>
<button ng-click="save()" ng-disabled="form.$invalid" type="button" class="btn btn-primary">Save</button>
</div>
</div>
</div>
</form>

View File

@ -31,8 +31,15 @@
<div ng-class="{error: identificationForm.identifier.$invalid}" class="control-group">
<label class="control-label">Identifier</label>
<div class="controls">
<input ng-model="identification.model.identifier" type="text" name="identifier" required="true" class="input-xlarge">
<input
ng-model="identification.model.identifier"
ab-unique="{field: 'identifier', key: master._id}"
required="true"
type="text"
name="identifier"
class="input-xlarge">
<span ng-show="identificationForm.identifier.$error.required" class="help-inline">Required</span>
<span ng-show="identificationForm.identifier.$error.unique" class="help-inline">Identifier must be unique</span>
</div>
</div>
<div class="form-actions">

View File

@ -9,9 +9,14 @@
<div class="span12">
<div class="toolbelt">
<a href="/clients/add" class="btn btn-primary" ng-show="accountHasPermission('system.edit')">Create new Workorder</a>
<span class="toolbelt-text">Frequency:</span>
<select ng-model="frequency" name="frequency" class="input-xlarge">
<option value="">All</option>
<option ng-repeat="f in frequencies" value="{{f}}">{{f}}</option>
</select>
<div class="pull-right">
<span class="toolbelt-text">Month:</span>
<div class="input-append">
<div class="input-append">
<select ng-model="month" name="month" class="input-xlarge">
<option value="0">January</option>
<option value="1">February</option>
@ -26,8 +31,8 @@
<option value="10">November</option>
<option value="11">December</option>
</select>
<span class="add-on"><i class="icon-calendar"></i></span>
</div>
<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">

View File

@ -21,7 +21,7 @@
<tr>
<th colspan="2"></th>
<th colspan="5">Groups</th>
<th colspan="7">Permissions</th>
<th colspan="9">Permissions</th>
</tr>
<tr>
<th style="width: 15%">Name</th>
@ -35,9 +35,11 @@
<th style="width: 5%">Tags</th>
<th style="width: 5%">Messages</th>
<th style="width: 5%">Edit</th>
<th style="width: 5%">Billing</th>
<th style="width: 5%">Site</th>
<th style="width: 5%">Admin</th>
<th style="width: 5%">Frequency</th>
<th style="width: 5%">Schedulable</th>
</tr>
</thead>
<tbody>
@ -56,9 +58,11 @@
<td class="{{ checkPerm(user, 'system.tags') }}"><a ng-click="togglePerm(user, 'system.tags')"><i ng-class="{ 'icon-ok': checkPerm(user, 'system.tags'), 'icon-remove': !checkPerm(user, 'system.tags')}"></i></a></td>
<td class="{{ checkPerm(user, 'messages.receive') }}"><a ng-click="togglePerm(user, 'messages.receive')"><i ng-class="{ 'icon-ok': checkPerm(user, 'messages.receive'), 'icon-remove': !checkPerm(user, 'messages.receive')}"></i></a></td>
<td class="{{ checkPerm(user, 'system.edit') }}"><a ng-click="togglePerm(user, 'system.edit')"><i ng-class="{ 'icon-ok': checkPerm(user, 'system.edit'), 'icon-remove': !checkPerm(user, 'system.edit')}"></i></a></td>
<td class="{{ checkPerm(user, 'system.edit.billing') }}"><a ng-click="togglePerm(user, 'system.edit.billing')"><i ng-class="{ 'icon-ok': checkPerm(user, 'system.edit.billing'), 'icon-remove': !checkPerm(user, 'system.edit.billing')}"></i></a></td>
<td class="{{ checkPerm(user, 'system.site') }}"><a ng-click="togglePerm(user, 'system.site')"><i ng-class="{ 'icon-ok': checkPerm(user, 'system.site'), 'icon-remove': !checkPerm(user, 'system.site')}"></i></a></td>
<td class="{{ checkPerm(user, 'system.admin') }}"><a ng-click="togglePerm(user, 'system.admin')"><i ng-class="{ 'icon-ok': checkPerm(user, 'system.admin'), 'icon-remove': !checkPerm(user, 'system.admin')}"></i></a></td>
<td class="{{ checkPerm(user, 'client.frequency') }}"><a ng-click="togglePerm(user, 'client.frequency')"><i ng-class="{ 'icon-ok': checkPerm(user, 'client.frequency'), 'icon-remove': !checkPerm(user, 'client.frequency')}"></i></a></td>
<td class="{{ checkPerm(user, 'workorder.schedulable') }}"><a ng-click="togglePerm(user, 'workorder.schedulable')"><i ng-class="{ 'icon-ok': checkPerm(user, 'workorder.schedulable'), 'icon-remove': !checkPerm(user, 'workorder.schedulable')}"></i></a></td>
</tr>
</tbody>
</table>

View File

@ -16,39 +16,7 @@
<div class="section-label">Status</div>
<div class="section-container">
<div ng-hide="status.visible" class="form-preview">
{{master.status}}<br>
<a ng-click="status.edit()" ng-class="{disabled: editing}" ng-show="accountHasPermission('system.edit')">Edit</a>
</div>
<div ng-show="status.visible" class="form-editor">
<div class="control-group">
<label class="control-label">Status</label>
<div class="controls">
<select ng-model="status.model.status" name="status" class="input-xlarge">
<option value="scheduled">Scheduled</option>
<option value="invoiced">Invoiced</option>
<option value="paid">Paid</option>
<option value="submitted">Submitted</option>
<option value="n/a">N/A</option>
</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-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>
<b>{{master.status}}</b><br>
</div>
</div>
</form>
@ -345,6 +313,35 @@
</div>
</div>
</div>
<form name="form" class="form-section" style="margin-bottom: 0">
<div class="section-label">Billing</div>
<div class="section-container">
<div ng-hide="status.visible" class="form-preview">
<span ng-show="master.invoiceNumber">Invoice Number: <b>{{master.invoiceNumber}}</b><br></span>
<span ng-show="master.checkNumber">Check Number: <b>{{master.checkNumber}}</b><br></span>
<a ng-click="status.edit()" ng-class="{disabled: editing}" ng-show="accountHasPermission('system.edit.billing')">Edit</a>
</div>
<div ng-show="status.visible" class="form-editor">
<div class="control-group">
<label class="control-label">Invoice Number</label>
<div class="controls">
<input ng-disabled="status.model.checkNumber" ng-model="status.model.invoiceNumber" type="text" class="input-small">
</div>
</div>
<div class="control-group">
<label class="control-label">Check Number</label>
<div class="controls">
<input ng-disabled="!status.model.invoiceNumber" ng-model="status.model.checkNumber" type="text" class="input-small">
</div>
</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-click="status.reset()" type="button" class="btn">Cancel</button>
</div>
</div>
</div>
</form>
<div class="form-section">
<div class="section-label">Other</div>
<div class="section-container">