Formatting, refactoring…
This commit is contained in:
parent
228f537123
commit
b5e78e5389
@ -1,3 +1,4 @@
|
|||||||
|
{# vim: set tw=80 ts=2 sw=2 sts=2: #}
|
||||||
{#
|
{#
|
||||||
This file is part of Accountant.
|
This file is part of Accountant.
|
||||||
|
|
||||||
@ -16,6 +17,7 @@
|
|||||||
#}
|
#}
|
||||||
{% extends "layout.html" %}
|
{% extends "layout.html" %}
|
||||||
{% block body %}
|
{% block body %}
|
||||||
|
|
||||||
<div ng-controller="EntryController">
|
<div ng-controller="EntryController">
|
||||||
<!-- Chart row -->
|
<!-- Chart row -->
|
||||||
<div class="row">
|
<div class="row">
|
||||||
@ -32,69 +34,130 @@
|
|||||||
<!-- Head of the table containing column headers and size -->
|
<!-- Head of the table containing column headers and size -->
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
<th style="width: 100px">Date d'op.</th>
|
<th class="col-md-1">Date d'op.</th>
|
||||||
<th>Libellé de l'opération</th>
|
<th>Libellé de l'opération</th>
|
||||||
<th style="width: 50px">Montant</th>
|
<th class="col-md-1">Montant</th>
|
||||||
<th style="width: 50px">Solde</th>
|
<th class="col-md-1">Solde</th>
|
||||||
<th style="width: 100px">Catégorie</th>
|
<th class="col-md-3">Catégorie</th>
|
||||||
<th style="width: 80px">Actions</th>
|
<th class="col-md-2">Actions</th>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
|
|
||||||
<!-- Body of the table containing the entries -->
|
<!-- Body of the table containing the entries -->
|
||||||
<tbody>
|
<tbody>
|
||||||
<tr id="entry_[[entry.id]]" class="form-inline" ng-class="entryRowClass(entry)" ng-repeat="entry in entries">
|
{# The new entry row. #}
|
||||||
<td>
|
<tr class="form-inline">
|
||||||
<small>
|
<td class="col-md-1">
|
||||||
<input ng-show="isEditing(entry)" type="text" class="form-control input-sm" ng-model="entry.operation_date" data-date-format="yyyy-mm-dd" bs-datepicker/>
|
<input type="text" class="form-control input-sm" ng-model="newEntry.operation_date" data-date-format="yyyy-mm-dd" bs-datepicker/>
|
||||||
<span ng-show="isDisplaying(entry)">[[entry.operation_date]]</span>
|
|
||||||
</small>
|
|
||||||
</td>
|
</td>
|
||||||
|
|
||||||
<td>
|
<td>
|
||||||
<small>
|
<input type="text" class="form-control input-sm" ng-model="newEntry.label"/>
|
||||||
<input ng-show="isEditing(entry)" type="text" class="form-control input-sm" ng-model="entry.label"/>
|
|
||||||
<span ng-show="isDisplaying(entry)">[[entry.label]]</span>
|
|
||||||
</small>
|
|
||||||
</td>
|
</td>
|
||||||
|
|
||||||
<td>
|
<td class="col-md-1">
|
||||||
<small>
|
<input type="text" class="form-control input-sm" ng-model="newEntry.value"/>
|
||||||
<input ng-show="isEditing(entry)" type="text" class="form-control input-sm" ng-model="entry.value"/>
|
|
||||||
<span ng-show="isDisplaying(entry)">[[entry.value]]</span>
|
|
||||||
</small>
|
|
||||||
</td>
|
</td>
|
||||||
|
|
||||||
<td ng-class="entryValueClass(entry.sold)">
|
<td class="col-md-1">
|
||||||
<small>
|
<!-- The new entry has no sold. -->
|
||||||
[[entry.sold]]
|
|
||||||
</small>
|
|
||||||
</td>
|
</td>
|
||||||
|
|
||||||
<td>
|
<td class="col-md-3">
|
||||||
<small>
|
<input type="text" class="form-control input-sm" ng-model="newEntry.category"/>
|
||||||
<!--<input ng-show="isEditing(entry)" type="text" class="form-control input-sm" ng-model="entry.category" bs-typeahead="categories"/>-->
|
|
||||||
<input ng-show="isEditing(entry)" type="text" class="form-control input-sm" ng-model="entry.category"/>
|
|
||||||
<span ng-show="isDisplaying(entry)">[[entry.category]]</span>
|
|
||||||
</small>
|
|
||||||
</td>
|
</td>
|
||||||
|
|
||||||
<td>
|
<td class="col-md-2">
|
||||||
<div class="btn-group" ng-show="isEditing(entry)">
|
<div class="btn-group">
|
||||||
<button type="button" class="btn btn-xs btn-success" ng-click="saveEntry(entry)" title="Save">
|
<button type="button" class="btn btn-xs btn-success"
|
||||||
<span ng-class="iconSaveClass(entry)"></span>
|
ng-click="createEntry(newEntry)" title="Save">
|
||||||
|
<span class="fa fa-plus"></span>
|
||||||
</button>
|
</button>
|
||||||
|
|
||||||
<button type="button" class="btn btn-xs btn-default" ng-click="cancelEditEntry(entry)" title="Cancel">
|
<button type="button" class="btn btn-xs btn-default"
|
||||||
<span ng-class="iconCancelClass(entry)"></span>
|
ng-click="resetNewEntry()" title="Cancel">
|
||||||
|
<span class="fa fa-times"></span>
|
||||||
</button>
|
</button>
|
||||||
|
|
||||||
<button type="button" class="btn btn-xs btn-default" ng-click="pointEntry(entry)" ng-class="pointedEntryClass(entry)" title="point">
|
<button type="button" class="btn btn-xs btn-default"
|
||||||
|
ng-click="newEntry.pointed=!newEntry.pointed"
|
||||||
|
ng-class="{active: newEntry.pointed}" title="point">
|
||||||
<span class="fa fa-check"></span>
|
<span class="fa fa-check"></span>
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
|
||||||
<div class="btn-group" ng-show="isDisplaying(entry) && isSaved(entry)">
|
{# Row for an editing entry. #}
|
||||||
|
<tr id="entry_[[entry.id]]" class="form-inline"
|
||||||
|
ng-class="entryRowClass(entry)" ng-repeat-start="entry in entries"
|
||||||
|
ng-if="isEditing(entry)">
|
||||||
|
<td class="col-md-1">
|
||||||
|
<input type="text" class="form-control input-sm" ng-model="entry.operation_date" data-date-format="yyyy-mm-dd" bs-datepicker/>
|
||||||
|
</td>
|
||||||
|
|
||||||
|
<td>
|
||||||
|
<input type="text" class="form-control input-sm" ng-model="entry.label"/>
|
||||||
|
</td>
|
||||||
|
|
||||||
|
<td class="col-md-1 col-xs-1">
|
||||||
|
<input type="text" class="form-control input-sm" ng-model="entry.value"/>
|
||||||
|
</td>
|
||||||
|
|
||||||
|
<td class="col-md-1" ng-class="entryValueClass(entry.sold)">
|
||||||
|
<small>[[entry.sold]]</small>
|
||||||
|
</td>
|
||||||
|
|
||||||
|
<td class="col-md-3">
|
||||||
|
<input type="text" class="form-control input-sm" ng-model="entry.category"/>
|
||||||
|
</td>
|
||||||
|
|
||||||
|
<td class="col-md-2">
|
||||||
|
<div class="btn-group">
|
||||||
|
<button type="button" class="btn btn-xs btn-success" ng-click="saveEntry(entry)" title="Save">
|
||||||
|
<span class="fa fa-floppy-o"></span>
|
||||||
|
</button>
|
||||||
|
|
||||||
|
<button type="button" class="btn btn-xs btn-default" ng-click="cancelEditEntry(entry)" title="Cancel">
|
||||||
|
<span class="fa fa-times"></span>
|
||||||
|
</button>
|
||||||
|
|
||||||
|
<button type="button" class="btn btn-xs btn-default"
|
||||||
|
ng-click="pointEntry(entry)"
|
||||||
|
ng-class="{active: entry.pointed}" title="point">
|
||||||
|
<span class="fa fa-check"></span>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
|
||||||
|
{# Row for a displayed entry. #}
|
||||||
|
<tr id="entry_[[entry.id]]"
|
||||||
|
ng-class="entryRowClass(entry)" ng-repeat-end
|
||||||
|
ng-if="isDisplaying(entry)">
|
||||||
|
<td class="col-md-1">
|
||||||
|
<small><span>[[entry.operation_date | date:"yyyy-MM-dd"]]</span></small>
|
||||||
|
</td>
|
||||||
|
|
||||||
|
<td>
|
||||||
|
<small><span>[[entry.label]]</span></small>
|
||||||
|
</td>
|
||||||
|
|
||||||
|
<td class="col-md-1">
|
||||||
|
<small><span>[[entry.value]]</span></small>
|
||||||
|
</td>
|
||||||
|
|
||||||
|
<td class="col-md-1" ng-class="{entryValueClass(entry.sold)">
|
||||||
|
<small>[[entry.sold]]</small>
|
||||||
|
</td>
|
||||||
|
|
||||||
|
<td class="col-md-3">
|
||||||
|
<small><span>[[entry.category]]</span></small>
|
||||||
|
</td>
|
||||||
|
|
||||||
|
<td class="col-md-2">
|
||||||
|
{# Button group for a saved entry. #}
|
||||||
|
<div class="btn-group" ng-if="isSaved(entry)">
|
||||||
<button class="btn btn-xs btn-default" ng-click="editEntry(entry)" title="edit">
|
<button class="btn btn-xs btn-default" ng-click="editEntry(entry)" title="edit">
|
||||||
<span class="fa fa-pencil-square-o"></span>
|
<span class="fa fa-pencil-square-o"></span>
|
||||||
</button>
|
</button>
|
||||||
@ -103,21 +166,26 @@
|
|||||||
<span class="fa fa-trash"></span>
|
<span class="fa fa-trash"></span>
|
||||||
</button>
|
</button>
|
||||||
|
|
||||||
<button class="btn btn-xs btn-default" ng-click="pointEntry(entry)" ng-class="pointedEntryClass(entry)" title="point">
|
<button class="btn btn-xs btn-default"
|
||||||
|
ng-click="pointEntry(entry)"
|
||||||
|
ng-class="{active: entry.pointed}" title="point">
|
||||||
<span class="fa fa-check"></span>
|
<span class="fa fa-check"></span>
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="btn-group" ng-show="isDisplaying(entry) && !isSaved(entry)">
|
{# Button group for an unsaved (scheduled) entry. #}
|
||||||
|
<div class="btn-group" ng-if="!isSaved(entry)">
|
||||||
<button class="btn btn-xs btn-success" ng-click="saveEntry(entry)" title="Save">
|
<button class="btn btn-xs btn-success" ng-click="saveEntry(entry)" title="Save">
|
||||||
<span ng-class="iconSaveClass(entry)"></span>
|
<span class="fa fa-plus"></span>
|
||||||
</button>
|
</button>
|
||||||
|
|
||||||
<button class="btn btn-xs btn-default" ng-click="editEntry(entry)" title="edit">
|
<button class="btn btn-xs btn-default" ng-click="editEntry(entry)" title="edit">
|
||||||
<span class="fa fa-pencil-square-o"></span>
|
<span class="fa fa-pencil-square-o"></span>
|
||||||
</button>
|
</button>
|
||||||
|
|
||||||
<button class="btn btn-xs btn-default" ng-click="pointEntry(entry)" ng-class="pointedEntryClass(entry)" title="point">
|
<button class="btn btn-xs btn-default"
|
||||||
|
ng-click="pointEntry(entry)"
|
||||||
|
ng-class="{active: entry.pointed}" title="point">
|
||||||
<span class="fa fa-check"></span>
|
<span class="fa fa-check"></span>
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
|
Loading…
Reference in New Issue
Block a user