branch develop updated (a728d75 -> 3fa1595)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository chorem. See http://git.chorem.org/chorem.git from a728d75 some upgrade new 3fa1595 is expense account page cuter ? The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 3fa15951d3866cecfb20100800ff340309a4155c Author: Yannick Martel <yannick.martel@gmail.com> Date: Fri Jan 30 17:44:44 2015 +0100 is expense account page cuter ? Summary of changes: .../src/main/webapp/WEB-INF/jsp/decorator.jsp | 6 ++- .../jsp/financial/expenseAccountEntryEdit.html | 1 + .../WEB-INF/jsp/financial/expenseAccountView.jsp | 62 +++++++++++----------- 3 files changed, 37 insertions(+), 32 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository chorem. See http://git.chorem.org/chorem.git commit 3fa15951d3866cecfb20100800ff340309a4155c Author: Yannick Martel <yannick.martel@gmail.com> Date: Fri Jan 30 17:44:44 2015 +0100 is expense account page cuter ? --- .../src/main/webapp/WEB-INF/jsp/decorator.jsp | 6 ++- .../jsp/financial/expenseAccountEntryEdit.html | 1 + .../WEB-INF/jsp/financial/expenseAccountView.jsp | 62 +++++++++++----------- 3 files changed, 37 insertions(+), 32 deletions(-) diff --git a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp index 5bc90d5..225cc66 100644 --- a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp +++ b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp @@ -182,7 +182,8 @@ <a href="<c:url value="/wikitty/Category/edit/new"/>"><span class="glyphicon glyphicon-plus"></span></a> </li> <li> - <a href="<c:url value="/financial/expenseAccounts"/>"><span class="glyphicon glyphicon-th-list"></span></a> + <a href="<c:url value="/financial/expenseAccounts"/>"><span class="glyphicon glyphicon-th-list">Expense Accounts</span></a> + <a href="<c:url value="/financial/expenseAccounts/new"/>"><span class="glyphicon glyphicon-plus">New Exp. Account</span></a> </li> <li class="divider"></li> <li>Report</li> @@ -219,6 +220,9 @@ <li><a href="<c:url value="/wikitty/VacationRequest/edit/new"/>"><span class="glyphicon glyphicon-plus"></span> Add request</a></li> <li><a href="<c:url value="/report?report=requestVacation"/>"><span class="glyphicon glyphicon-th-list"></span> Dashboard vacations</a></li> <li><a href="<c:url value="/hr/vacationRequest/edit/new"/>"><span class="glyphicon glyphicon-plus"></span> Add Leave Request</a></li> + <li>Expense Accounts</li> + <li><a href="<c:url value="/financial/ExpenseAccounts"/>"><span class="glyphicon glyphicon-th-list"></span>Expense Accounts</a></li> + <li><a href="<c:url value="/financial/ExpenseAccounts/new"/>"><span class="glyphicon glyphicon-plus"></span>Add expense account</a></li> </ul> </li> <li class="dropdown nav-group"> diff --git a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/expenseAccountEntryEdit.html b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/expenseAccountEntryEdit.html index 41ce608..bcbedce 100644 --- a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/expenseAccountEntryEdit.html +++ b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/expenseAccountEntryEdit.html @@ -35,4 +35,5 @@ <td><input type="number" ng-model="newExpenseAccountEntry.amount" name="newExpenseAccountEntry.amount" min="0" style='width:100%'></td> <td><input type="number" ng-model="newExpenseAccountEntry.VAT" name="newExpenseAccountEntry.VAT" min="0" style='width:100%'></td> <td>{{(newExpenseAccountEntry.amount * 1) + (newExpenseAccountEntry.VAT * 1)}}</td> + <td>Be patient ;)</td> <td><a class="btn btn-success" ng-click="addLine()"><i class="icon-pencil icon-white"></i>Validate</a></td> diff --git a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/expenseAccountView.jsp b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/expenseAccountView.jsp index a21f57c..104bed6 100644 --- a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/expenseAccountView.jsp +++ b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/expenseAccountView.jsp @@ -35,42 +35,42 @@ </head> <div ng-app='expenseAccountPage' ng-controller="expenseAccountView"> - <div > - <dl> - <dd ng-show="editEmployee"> - <input type="text" ng-model="expenseAccount.employeeName" id="text-expenseAccount-employee" auto-complete data-source="Employee" data-model="expenseAccount" data-base-field="employee" /> - <input type="hidden" ng-model="expenseAccount.employeeId" id="hidden-expenseAccount-employee"/> - </dd> - <dd ng-show="!editEmployee"> - <a href="<c:url value="/wikitty/view/{{expenseAccount.employeeId}}"/>">{{expenseAccount.employeeName}}</a> - <span class="glyphicon glyphicon-pencil" ng-click="editEmployee = !editEmployee; hasChanged = true"></span> - </dd> - <dd ng-show="!editPeriod"> - <span>Period from {{expenseAccount.startDate |date : "dd/MM/yyyy"}} to {{expenseAccount.endDate |date : "dd/MM/yyyy"}}</span> - <span class="glyphicon glyphicon-pencil" ng-click="editPeriod = !editPeriod; hasChanged = true"></span> - </dd> + <div class="form-inline"> + <div ng-show="editEmployee" class="form-group"> + <label class="control-label">Employee</label> + <input class="form-control" type="text" ng-model="expenseAccount.employeeName" + id="text-expenseAccount-employee" auto-complete data-source="Employee" data-model="expenseAccount" data-base-field="employee" /> + <input type="hidden" ng-model="expenseAccount.employeeId" id="hidden-expenseAccount-employee"/> + </div> + <div ng-show="!editEmployee" class="form-group"> + <a href="<c:url value="/wikitty/view/{{expenseAccount.employeeId}}"/>">{{expenseAccount.employeeName}}</a> + <span class="glyphicon glyphicon-pencil" ng-click="editEmployee = !editEmployee; hasChanged = true"></span> + </div> - <dd ng-show="editPeriod"> - <span>From </span> - <input id="expenseAccountBeginDate" class="form-control" type="text" - datepicker-popup="dd/MM/yyyy" - ng-model="expenseAccount.startDate" - is-open="startDateOpened" - ng-click="startDateOpened = true"/> - <span>To :</span> - <input id="expenseAccountEndDate" class="form-control" type="text" - datepicker-popup="dd/MM/yyyy" - ng-model="expenseAccount.endDate" - is-open="endDateOpened" - ng-click="endDateOpened = true" /> - </dd> + <div ng-show="!editPeriod" class="form-group pull-right"> + <span>Period from {{expenseAccount.startDate |date : "dd/MM/yyyy"}} to {{expenseAccount.endDate |date : "dd/MM/yyyy"}}</span> + <span class="glyphicon glyphicon-pencil" ng-click="editPeriod = !editPeriod; hasChanged = true"></span> + </div> - </dd> - </dl> + <div ng-show="editPeriod" class="form-group pull-right"> + <span>From </span> + <input id="expenseAccountBeginDate" class="form-control" type="text" + datepicker-popup="dd/MM/yyyy" + ng-model="expenseAccount.startDate" + is-open="startDateOpened" + ng-click="startDateOpened = true"/> + <span>To :</span> + <input id="expenseAccountEndDate" class="form-control" type="text" + datepicker-popup="dd/MM/yyyy" + ng-model="expenseAccount.endDate" + is-open="endDateOpened" + ng-click="endDateOpened = true" /> + </div> </div> + <br/> <div> - <table> + <table class="table table-bordered"> <tr> <th style='width:15%'>Justif. Nb</th> <th style='width:10%'>Emitted Date</th> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm