Chorem-commits

Download

chorem-commits@list.chorem.org

545 discussions

r412 - trunk
by ymartel＠users.chorem.org 11 Apr '14

11 Apr '14

Author: ymartel Date: 2014-04-11 12:23:42 +0200 (Fri, 11 Apr 2014) New Revision: 412 Url: http://forge.chorem.org/projects/chorem/repository/revisions/412 Log: use webmotion 2.4 stable Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-04-10 14:01:22 UTC (rev 411) +++ trunk/pom.xml 2014-04-11 10:23:42 UTC (rev 412) @@ -98,7 +98,7 @@ <servletApiVersion>3.0-alpha-1</servletApiVersion> <jspApiVersion>2.0</jspApiVersion> <h2Version>1.3.175</h2Version> - <webmotionVersion>2.4-SNAPSHOT</webmotionVersion> + <webmotionVersion>2.4</webmotionVersion> <jstlVersion>1.2</jstlVersion> <nuitonjsAngularjs.version>1.2.12-1</nuitonjsAngularjs.version> <nuitonjsJquery.version>1.8.3-1</nuitonjsJquery.version>

1 0

r411 - in trunk/chorem-webmotion/src/main: resources webapp/WEB-INF/jsp/financial webapp/WEB-INF/jsp/projects webapp/js
by ymartel＠users.chorem.org 10 Apr '14

10 Apr '14

Author: ymartel Date: 2014-04-10 16:01:22 +0200 (Thu, 10 Apr 2014) New Revision: 411 Url: http://forge.chorem.org/projects/chorem/repository/revisions/411 Log: review way to manage pagination on expenseAccount (make it neutral to be reused) review draft of expenseAccount view page Added: trunk/chorem-webmotion/src/main/webapp/js/paginationTable.js Removed: trunk/chorem-webmotion/src/main/webapp/js/expensePagination.js Modified: trunk/chorem-webmotion/src/main/resources/mapping trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/expenseAccountView.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/expenseAccounts.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/projects/projects.jsp trunk/chorem-webmotion/src/main/webapp/js/projectPagination.js Modified: trunk/chorem-webmotion/src/main/resources/mapping =================================================================== --- trunk/chorem-webmotion/src/main/resources/mapping 2014-04-09 14:29:44 UTC (rev 410) +++ trunk/chorem-webmotion/src/main/resources/mapping 2014-04-10 14:01:22 UTC (rev 411) @@ -13,8 +13,6 @@ * /sales/funnel/json/* DecoratorFilter.decorate wmDecoratorNo=true * /sales/funnel/partial/* DecoratorFilter.decorate wmDecoratorNo=true * /crm/export DecoratorFilter.decorate wmDecoratorNo=true -* /project/json/* DecoratorFilter.decorate wmDecoratorNo=true -* /financial/json/* DecoratorFilter.decorate wmDecoratorNo=true * /project/editProject.html DecoratorFilter.decorate wmDecoratorNo=true * /hr/employeeEdit/json/* DecoratorFilter.decorate wmDecoratorNo=true * /ascii/* DecoratorFilter.decorate wmDecoratorNo=true @@ -95,13 +93,14 @@ * /crm/quotation/edit/{id} action:crm.QuotationAction.edit * /crm/export action:crm.ExportAction.exportContactBase -GET /project/json/projects?page={page}&count={count} action:project.ProjectsAction.findAllProjects page=1,count=10 +GET /rest/project/projects?page={page}&count={count} action:project.ProjectsAction.findAllProjects page=1,count=10 GET /project/projects view:projects/projects.jsp -GET /project/editProject view:projects/editProject.html +GET /project/editProject.html view:projects/editProject.html PUT /projects/{projectId}/ action:project.ProjectsAction.updateProject #### Expense Accounts #### -GET /financial/json/expenseAccounts?year={year}&month={month}&page={page}&count={count} action:financial.ExpenseAccountAction.findAllExpenseAccounts page=1,count=20 +GET /rest/financial/expenseAccounts?page={page}&count={count} action:financial.ExpenseAccountAction.findAllExpenseAccounts page=1,count=20 +GET /rest/financial/expenseAccounts/{expenseAccountId} action:financial.ExpenseAccountAction.findExpenseAccount GET /financial/expenseAccounts view:financial/expenseAccounts.jsp GET /financial/expenseAccounts/{expenseAccountId} action:financial.ExpenseAccountAction.findExpenseAccount PUT /financial/expenseAccounts/{expenseAccountId} action:financial.ExpenseAccountAction.saveExpenseAccount Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/expenseAccountView.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/expenseAccountView.jsp 2014-04-09 14:29:44 UTC (rev 410) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/expenseAccountView.jsp 2014-04-10 14:01:22 UTC (rev 411) @@ -29,40 +29,42 @@ <link data-require="bootstrap-css@*" data-semver="3.0.0" rel="stylesheet" href="<c:url value='http://netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap.min.css'/>" /> </head> -<div > - <dl> - <dd><a href="<c:url value="/wikitty/view/${expenseAccount.employeeId}"/>">${expenseAccount.employeeName}</a></dd> - <dd>Period : ${expenseAccount.month} / ${expenseAccount.year}</dd> - </dl> -</div> +<div ng-app> + <div > + <dl> + <dd><a href="<c:url value="/wikitty/view/${expenseAccount.employeeId}"/>">${expenseAccount.employeeName}</a></dd> + <dd>Period : {{expenseAccount.month}} / ${expenseAccount.year}</dd> + </dl> + </div> -<div ng-app> - <table> - <tr> - <th>Justif. Nb</th> - <th>Emitted Date</th> - <th>Project</th> - <th>Description</th> - <th>Category</th> - <th>Amount</th> - <th>VAT</th> - <th>total</th> - <th>Payment Date</th> - </tr> - <c:forEach var="expenseEntry" items="${expenseAccount.expenseAccountEntries}"> - <tr> - <td>${expenseEntry.justificationNumber}</td> - <td>{{${expenseEntry.emittedDate}| date:'shortDate'}}</td> - <td><a href="<c:url value="/wikitty/view/${expenseEntry.projectId}"/>">${expenseEntry.projectName}</a></td> - <td>${expenseEntry.description}</td> - <td>${expenseEntry.categoryName}</td> - <td>{{${expenseEntry.amount}|number:2}}</td> - <td>{{${expenseEntry.VAT}|number:2}}</td> - <td>{{${expenseEntry.total}|number:2}}</td> - <td><span ng-if = "${expenseEntry.paymentDate} != 0"> {{${expenseEntry.paymentDate}|date:'shortDate'}}</span></td> - </tr> - </c:forEach> - </table> + <div> + <table> + <tr> + <th>Justif. Nb</th> + <th>Emitted Date</th> + <th>Project</th> + <th>Description</th> + <th>Category</th> + <th>Amount</th> + <th>VAT</th> + <th>total</th> + <th>Payment Date</th> + </tr> + <c:forEach var="expenseEntry" items="${expenseAccount.expenseAccountEntries}"> + <tr> + <td>${expenseEntry.justificationNumber}</td> + <td>{{${expenseEntry.emittedDate}| date:'shortDate'}}</td> + <td><a href="<c:url value="/wikitty/view/${expenseEntry.projectId}"/>">${expenseEntry.projectName}</a></td> + <td>${expenseEntry.description}</td> + <td>${expenseEntry.categoryName}</td> + <td>{{${expenseEntry.amount}|number:2}}</td> + <td>{{${expenseEntry.VAT}|number:2}}</td> + <td>{{${expenseEntry.total}|number:2}}</td> + <td><span ng-if = "${expenseEntry.paymentDate} != 0"> {{${expenseEntry.paymentDate}|date:'shortDate'}}</span></td> + </tr> + </c:forEach> + </table> + </div> </div> <div> Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/expenseAccounts.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/expenseAccounts.jsp 2014-04-09 14:29:44 UTC (rev 410) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/expenseAccounts.jsp 2014-04-10 14:01:22 UTC (rev 411) @@ -29,14 +29,20 @@ <script data-require="ng-table@*" data-semver="0.3.0" src="<c:url value='http://bazalt-cms.com/assets/ng-table/0.3.0/ng-table.js'/>"></script> <link data-require="ng-table@*" data-semver="0.3.0" rel="stylesheet" href="<c:url value='http://bazalt-cms.com/assets/ng-table/0.3.0/ng-table.css'/>" /> <link data-require="bootstrap-css@*" data-semver="3.0.0" rel="stylesheet" href="<c:url value='http://netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap.min.css'/>" /> - <script type="text/javascript" src="<c:url value='/js/expensePagination.js'/>"></script> + <script type="text/javascript" src="<c:url value='/js/paginationTable.js'/>"></script> + <script> + angular.module('Pagination').value('paginationInit', { + url : "<c:url value="/rest/financial/expenseAccounts"/>", + params: {page: 1, count: 10} + }); + </script> </head> -<div ng-app="expenseAccountList" ng-controller="PageCtrl"> +<div ng-app="Pagination" ng-controller="PageCtrl"> <div loading-container="tableParams.settings().$loading"> <table ng-table="tableParams" show-filter="false" class="table"> - <tbody ng-repeat="expenseAccount in expenseAccounts"> + <tbody ng-repeat="expenseAccount in elements"> <tr id="tr{{expenseAccount.id}}" ng-class-odd="'odd'" ng-class-even="'even'"> <td data-title="'Employee'"> <a href="<c:url value="/wikitty/view/{{expenseAccount.employeeId}}"/>">{{expenseAccount.employeeName}}</a> Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/projects/projects.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/projects/projects.jsp 2014-04-09 14:29:44 UTC (rev 410) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/projects/projects.jsp 2014-04-10 14:01:22 UTC (rev 411) @@ -31,9 +31,15 @@ <link data-require="ng-table@*" data-semver="0.3.0" rel="stylesheet" href="<c:url value='http://bazalt-cms.com/assets/ng-table/0.3.0/ng-table.css'/>" /> <link data-require="bootstrap-css@*" data-semver="3.0.0" rel="stylesheet" href="<c:url value='http://netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap.min.css'/>" /> <script type="text/javascript" src="<c:url value='/js/projectPagination.js'/>"></script> + <script> + angular.module('Pagination').value('paginationInit', { + url : "<c:url value="/rest/project/projects"/>", + params : {page: 1, count: 10, sorting: {name: 'asc'}} + }); + </script> </head> -<div ng-app="projectList" ng-controller="PageCtrl"> +<div ng-app="Pagination" ng-controller="PageCtrl"> <div loading-container="tableParams.settings().$loading"> <table ng-table="tableParams" show-filter="true" class="table"> Deleted: trunk/chorem-webmotion/src/main/webapp/js/expensePagination.js =================================================================== --- trunk/chorem-webmotion/src/main/webapp/js/expensePagination.js 2014-04-09 14:29:44 UTC (rev 410) +++ trunk/chorem-webmotion/src/main/webapp/js/expensePagination.js 2014-04-10 14:01:22 UTC (rev 411) @@ -1,70 +0,0 @@ -/* - * #%L - * Chorem :: webmotion - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2011 - 2014 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -var app = angular.module('expenseAccountList', ['ngTable', 'ngResource']); - -app.controller('PageCtrl', - function($scope, $timeout, $resource, ngTableParams) { - - var Api = $resource('json/expenseAccounts'); - - $scope.tableParams = new ngTableParams({ - page: 1, // show first page - count: 20, - year: 2014, - month: 03 - }, { - total: 0, // length of data - getData: function($defer, params) { - - // ajax request to api - url = params.url(); - Api.get(url, function(data) { - $timeout(function() { - // update table params - params.total(data.total); - console.log(data); - // set new data - $scope.expenseAccounts = data.elements; - $defer.resolve(data); - }, 500); - }); - } - }); - -}); - -angular.module('expenseAccountList') -.directive('loadingContainer', function () { - return { - restrict: 'A', - scope: false, - link: function(scope, element, attrs) { - var loadingLayer = angular.element('<div class="loading"></div>'); - element.append(loadingLayer); - element.addClass('loading-container'); - scope.$watch(attrs.loadingContainer, function(value) { - loadingLayer.toggleClass('ng-hide', !value); - }); - } - }; -}); \ No newline at end of file Copied: trunk/chorem-webmotion/src/main/webapp/js/paginationTable.js (from rev 410, trunk/chorem-webmotion/src/main/webapp/js/expensePagination.js) =================================================================== --- trunk/chorem-webmotion/src/main/webapp/js/paginationTable.js (rev 0) +++ trunk/chorem-webmotion/src/main/webapp/js/paginationTable.js 2014-04-10 14:01:22 UTC (rev 411) @@ -0,0 +1,64 @@ +/* + * #%L + * Chorem :: webmotion + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +var app = angular.module('Pagination', ['ngTable', 'ngResource']); + +app.controller('PageCtrl', + function($scope, $timeout, $resource, ngTableParams, paginationInit) { + + var Api = $resource(paginationInit.url); + + $scope.tableParams = new ngTableParams( + paginationInit.params, { + total: 0, // length of data + getData: function($defer, params) { + + // ajax request to api + url = params.url(); + Api.get(url, function(data) { + $timeout(function() { + // update table params + params.total(data.total); + // set new data + $scope.elements = data.elements; + $defer.resolve(data); + }, 500); + }); + } + }); + +}); + +angular.module('Pagination').directive('loadingContainer', function () { + return { + restrict: 'A', + scope: false, + link: function(scope, element, attrs) { + var loadingLayer = angular.element('<div class="loading"></div>'); + element.append(loadingLayer); + element.addClass('loading-container'); + scope.$watch(attrs.loadingContainer, function(value) { + loadingLayer.toggleClass('ng-hide', !value); + }); + } + }; +}); \ No newline at end of file Modified: trunk/chorem-webmotion/src/main/webapp/js/projectPagination.js =================================================================== --- trunk/chorem-webmotion/src/main/webapp/js/projectPagination.js 2014-04-09 14:29:44 UTC (rev 410) +++ trunk/chorem-webmotion/src/main/webapp/js/projectPagination.js 2014-04-10 14:01:22 UTC (rev 411) @@ -20,27 +20,21 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -var app = angular.module('projectList', ['ngTable', 'ngResource']); +var app = angular.module('Pagination', ['ngTable', 'ngResource']); app.controller('PageCtrl', - function($scope, $timeout, $resource, ngTableParams) { + function($scope, $timeout, $resource, ngTableParams, paginationInit) { - var Api = $resource('json/projects'); + var Api = $resource(paginationInit.url); - $scope.tableParams = new ngTableParams({ - page: 1, // show first page - count: 10, - sorting: { - name: 'asc' // initial sorting - } - }, { + $scope.tableParams = new ngTableParams( + paginationInit.params, { total: 0, // length of data getData: function($defer, params) { var sorting = params.sorting(); var orderBy = Object.keys(sorting)[0]; var ordering = orderBy + "." + sorting[orderBy]; - console.log(ordering); // ajax request to api url = params.url(); @@ -77,8 +71,7 @@ }); -angular.module('projectList') -.directive('loadingContainer', function () { +angular.module('Pagination').directive('loadingContainer', function () { return { restrict: 'A', scope: false,

1 0

09 Apr '14

Author: ymartel Date: 2014-04-09 16:29:44 +0200 (Wed, 09 Apr 2014) New Revision: 410 Url: http://forge.chorem.org/projects/chorem/repository/revisions/410 Log: - add financial module with start implementation of ExpenseAccounts - add svn properties & some file headers Added: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/financial/ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/financial/ExpenseAccountAction.java trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/bean/ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/bean/financial/ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/bean/financial/ExpenseAccountBean.java trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/bean/financial/ExpenseAccountEntryBean.java trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/expenseAccountView.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/expenseAccounts.jsp trunk/chorem-webmotion/src/main/webapp/js/expensePagination.js Modified: trunk/LICENSE.txt trunk/README.txt trunk/changelog.txt trunk/chorem-entities/LICENSE.txt trunk/chorem-entities/README.txt trunk/chorem-entities/changelog.txt trunk/chorem-entities/pom.xml trunk/chorem-entities/src/license/THIRD-PARTY.properties trunk/chorem-entities/src/main/java/com/inamik/utils/AbstractTableFormatter.java trunk/chorem-entities/src/main/java/com/inamik/utils/SimpleTableFormatter.java trunk/chorem-entities/src/main/java/com/inamik/utils/TableFormatter.java trunk/chorem-entities/src/main/java/org/chorem/ChoremAction.java trunk/chorem-entities/src/main/java/org/chorem/ChoremClient.java trunk/chorem-entities/src/main/java/org/chorem/ChoremConfig.java trunk/chorem-entities/src/main/java/org/chorem/ChoremConfigAction.java trunk/chorem-entities/src/main/java/org/chorem/ChoremConfigOption.java trunk/chorem-entities/src/main/java/org/chorem/ChoremMain.java trunk/chorem-entities/src/main/java/org/chorem/ChoremQueryHelper.java trunk/chorem-entities/src/main/java/org/chorem/ChoremQueryMaker.java trunk/chorem-entities/src/main/java/org/chorem/ChoremUtil.java trunk/chorem-entities/src/main/java/org/chorem/ImportChoremTopia.java trunk/chorem-entities/src/main/java/org/chorem/Saint.java trunk/chorem-entities/src/main/java/org/chorem/entities/EmployeeMigration.java trunk/chorem-entities/src/main/java/org/chorem/entities/ExpenseClaimStatus.java trunk/chorem-entities/src/main/java/org/chorem/entities/InvoiceMigration.java trunk/chorem-entities/src/main/java/org/chorem/entities/InvoiceStatus.java trunk/chorem-entities/src/main/java/org/chorem/entities/InvoiceableUtil.java trunk/chorem-entities/src/main/java/org/chorem/entities/Quotation18Migration.java trunk/chorem-entities/src/main/java/org/chorem/entities/QuotationMigration.java trunk/chorem-entities/src/main/java/org/chorem/entities/QuotationStatus.java trunk/chorem-entities/src/main/java/org/chorem/entities/TaskStatus.java trunk/chorem-entities/src/main/java/org/chorem/entities/VacationMigration.java trunk/chorem-entities/src/main/java/org/chorem/entities/VacationStatus.java trunk/chorem-entities/src/main/java/org/chorem/project/AdcCalculation.java trunk/chorem-entities/src/main/java/org/chorem/project/Calculation.java trunk/chorem-entities/src/main/java/org/chorem/project/QuotationCalculation.java trunk/chorem-entities/src/main/java/org/chorem/project/TaskCalculation.java trunk/chorem-entities/src/main/java/org/chorem/project/TotalQuotationCalculation.java trunk/chorem-entities/src/main/resources/chorem.properties trunk/chorem-entities/src/main/resources/log4j.properties trunk/chorem-entities/src/main/xmi/chorem-model.properties trunk/chorem-entities/src/main/xmi/chorem-model.zargo trunk/chorem-entities/src/main/xmi/vacations.rst trunk/chorem-entities/src/site/rst/chorem-entities-base.png trunk/chorem-entities/src/site/rst/chorem-entities-billy.png trunk/chorem-entities/src/site/rst/chorem-entities-bonzoms.png trunk/chorem-entities/src/site/rst/chorem-entities-gepeto.png trunk/chorem-entities/src/site/rst/dataModel.rst trunk/chorem-entities/src/site/rst/gepeto.rst trunk/chorem-entities/src/test/java/org/chorem/ChoremUtilTest.java trunk/chorem-entities/src/test/java/org/chorem/entities/InvoiceableUtilTest.java trunk/chorem-web/LICENSE.txt trunk/chorem-web/README.txt trunk/chorem-web/changelog.txt trunk/chorem-web/pom.xml trunk/chorem-web/src/main/i18n/jsp.rules trunk/chorem-web/src/main/java/org/chorem/ChoremSession.java trunk/chorem-web/src/main/java/org/chorem/ChoremUtil.java trunk/chorem-web/src/main/java/org/chorem/ContactDetailsConstants.java trunk/chorem-web/src/main/java/org/chorem/JspUtils.java trunk/chorem-web/src/main/java/org/chorem/action/ChoremBaseAction.java trunk/chorem-web/src/main/java/org/chorem/action/EntitySearchJsonAction.java trunk/chorem-web/src/main/java/org/chorem/action/HomeAction.java trunk/chorem-web/src/main/java/org/chorem/action/SelectWikittyComponentAction.java trunk/chorem-web/src/main/java/org/chorem/billy/action/QuotationAction.java trunk/chorem-web/src/main/java/org/chorem/gepeto/ProjectOrderFull.java trunk/chorem-web/src/main/java/org/chorem/gepeto/action/ProjectAction.java trunk/chorem-web/src/main/java/org/chorem/gepeto/action/ProjectOrderAction.java trunk/chorem-web/src/main/java/org/chorem/gepeto/action/TaskAction.java trunk/chorem-web/src/main/resources/freemarker.properties trunk/chorem-web/src/main/resources/i18n/chorem-web_en_GB.properties trunk/chorem-web/src/main/resources/i18n/chorem-web_fr_FR.properties trunk/chorem-web/src/main/resources/org/chorem/billy/action/QuotationAction-addQuotation-validation.xml trunk/chorem-web/src/main/resources/org/chorem/billy/action/QuotationAction-modifyQuotation-validation.xml trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/ProjectAction-addProject-validation.xml trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/ProjectAction-modifyProject-validation.xml trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/ProjectOrderAction-addProjectOrder-validation.xml trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/TaskAction-addTask-validation.xml trunk/chorem-web/src/main/resources/struts.properties trunk/chorem-web/src/main/resources/struts.xml trunk/chorem-web/src/main/webapp/WEB-INF/decorators.xml trunk/chorem-web/src/main/webapp/WEB-INF/decorators/billy.jsp trunk/chorem-web/src/main/webapp/WEB-INF/decorators/bonzoms.jsp trunk/chorem-web/src/main/webapp/WEB-INF/decorators/cash.jsp trunk/chorem-web/src/main/webapp/WEB-INF/decorators/gepeto.jsp trunk/chorem-web/src/main/webapp/WEB-INF/decorators/main.jsp trunk/chorem-web/src/main/webapp/WEB-INF/jsp/billy/addQuotation.jsp trunk/chorem-web/src/main/webapp/WEB-INF/jsp/billy/home.jsp trunk/chorem-web/src/main/webapp/WEB-INF/jsp/billy/menu.jsp trunk/chorem-web/src/main/webapp/WEB-INF/jsp/billy/quotationDetails.jsp trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/companies.jsp trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/menu.jsp trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/persons.jsp trunk/chorem-web/src/main/webapp/WEB-INF/jsp/common/inc/footer.jsp trunk/chorem-web/src/main/webapp/WEB-INF/jsp/common/inc/header.jsp trunk/chorem-web/src/main/webapp/WEB-INF/jsp/common/selectWikittyComponent.jsp trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/addProject.jsp trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/addProjectOrder.jsp trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/addTask.jsp trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/menu.jsp trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/projectDetails.jsp trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/projectOrderDetails.jsp trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/projects.jsp trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/projectsByYear.jsp trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/projectsWithoutQuotation.jsp trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/results.jsp trunk/chorem-web/src/main/webapp/WEB-INF/jsp/home.jsp trunk/chorem-web/src/main/webapp/WEB-INF/sitemesh.xml trunk/chorem-web/src/main/webapp/WEB-INF/web.xml trunk/chorem-web/src/main/webapp/css/style.css trunk/chorem-web/src/main/webapp/js/chorem.js trunk/chorem-web/src/main/webapp/template/simple/a-close.ftl trunk/chorem-web/src/main/webapp/template/simple/form-common.ftl trunk/chorem-web/src/main/webapp/template/xhtml/controlheader-core.ftl trunk/chorem-web/src/main/webapp/template/xhtml/file.ftl trunk/chorem-web/src/main/webapp/template/xhtml/form-close.ftl trunk/chorem-web/src/main/webapp/template/xhtml/form.ftl trunk/chorem-web/src/main/webapp/template/xhtml/password.ftl trunk/chorem-web/src/main/webapp/template/xhtml/submit-close.ftl trunk/chorem-web/src/main/webapp/template/xhtml/submit.ftl trunk/chorem-web/src/main/webapp/template/xhtml/text.ftl trunk/chorem-web/src/main/webapp/template/xhtml/textarea.ftl trunk/chorem-webmotion/LICENSE.txt trunk/chorem-webmotion/README.txt trunk/chorem-webmotion/changelog.txt trunk/chorem-webmotion/pom.xml trunk/chorem-webmotion/src/doc/REST_API_Timer.txt trunk/chorem-webmotion/src/jetty/jetty-context.xml trunk/chorem-webmotion/src/license/THIRD-PARTY.properties trunk/chorem-webmotion/src/main/i18n/jsp.rules trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/ChoremDateUtil.java trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/ChoremWebMotionUtil.java trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/PaginatedResult.java trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/AdcDashboardAction.java trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/AdminAction.java trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/BIAction.java trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/DashboardAction.java trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/DashboardHRAction.java trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/EmployeeEditAction.java trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/GenericAction.java trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/HrAction.java trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/MapWithDefault.java trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/WikittyRestAction.java trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/AccountAction.java trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/ContactRowForExport.java trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/ContactRowForExportModel.java trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/ExportAction.java trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/QuotationAction.java trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/DashboardProjectAction.java trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/GanttAction.java trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/ProjectsAction.java trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/QuotationData.java trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/QuotationStatusAction.java trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/TaskData.java trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/AcceptedQuotationsReportAction.java trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/AccountSalesReportAction.java trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/FunnelAction.java trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/ProjectSalesReportAction.java trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/QuotationYearData.java trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesAction.java trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesData.java trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesPerAccountReportAction.java trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesPerProjectReportAction.java trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesReportAction.java trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesReportHelper.java trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SentQuotationsReportAction.java trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/filters/AuthenticationFilter.java trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/filters/ChoremClientFilter.java trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/filters/DecoratorFilter.java trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/injector/InjectorListener.java trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/render/RenderWikitty.java trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/render/RenderWikittyJson.java trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyDisplay.java trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyInput.java trunk/chorem-webmotion/src/main/resources/i18n/chorem-webmotion_en_GB.properties trunk/chorem-webmotion/src/main/resources/i18n/chorem-webmotion_fr_FR.properties trunk/chorem-webmotion/src/main/resources/log4j.properties trunk/chorem-webmotion/src/main/resources/mapping trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/admin/importExport.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/bi/reportDefinition.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/contact.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/crm/account.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/crm/company.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/crm/editQuotation.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/crm/project.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardAdc.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardAnnualProfit.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardBudget.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardEmployee.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardInvoice.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardMultiProject.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardProfitability.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardProject.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardQuotation.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardRequestVacation.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardSingleProject.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardSummary.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardVAT.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardVacation.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardVacationAsked.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardVacationByEmployee.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardWorkingProjectDaysByEmployee.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/edit.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/editMulti.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/editRelated.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/editVacationRequest.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/employeeEdit.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/hr.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/index.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/login.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/projects/editProject.html trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/projects/projects.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/report.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/acceptedQuotation.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/accountSalesReport.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-cancel.html trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-draftToSent.html trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-leadToDraft.html trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-sentToAccepted.html trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-sentToRejected.html trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/menu.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/projectSalesReport.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/sales.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesFunnel.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesPerAccountReport.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesPerProjectReport.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesReport.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/sentQuotation.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/search.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/simpleWikiFields.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/vacationDiv.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/view.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionCompany.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionEmployee.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionFinancialTransaction.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionPerson.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionProject.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionQuotation.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionTask.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/nuiton-js.properties trunk/chorem-webmotion/src/main/webapp/WEB-INF/web.xml trunk/chorem-webmotion/src/main/webapp/WEB-INF/wikitty.tld trunk/chorem-webmotion/src/main/webapp/WEB-INF/wro.xml trunk/chorem-webmotion/src/main/webapp/css/chorem-bi.css trunk/chorem-webmotion/src/main/webapp/css/chorem-crm.css trunk/chorem-webmotion/src/main/webapp/css/chorem-sales.css trunk/chorem-webmotion/src/main/webapp/css/chorem.less trunk/chorem-webmotion/src/main/webapp/css/employeeEdit.css trunk/chorem-webmotion/src/main/webapp/css/jquery-ui-timepicker-addon.css trunk/chorem-webmotion/src/main/webapp/css/jquery.fn.gantt.css trunk/chorem-webmotion/src/main/webapp/css/ng-grid.min.css trunk/chorem-webmotion/src/main/webapp/css/select2/select2-spinner.gif trunk/chorem-webmotion/src/main/webapp/css/select2/select2.css trunk/chorem-webmotion/src/main/webapp/css/select2/select2.png trunk/chorem-webmotion/src/main/webapp/css/select2/select2x2.png trunk/chorem-webmotion/src/main/webapp/css/vacationRequest.css trunk/chorem-webmotion/src/main/webapp/img/ajax-loader.gif trunk/chorem-webmotion/src/main/webapp/img/glyphicons-halflings-white.png trunk/chorem-webmotion/src/main/webapp/img/glyphicons-halflings.png trunk/chorem-webmotion/src/main/webapp/img/jquery.fn.gantt/grid.png trunk/chorem-webmotion/src/main/webapp/img/jquery.fn.gantt/icon_sprite.png trunk/chorem-webmotion/src/main/webapp/img/jquery.fn.gantt/loader_bg.png trunk/chorem-webmotion/src/main/webapp/img/jquery.fn.gantt/slider_handle.png trunk/chorem-webmotion/src/main/webapp/js/chorem.js trunk/chorem-webmotion/src/main/webapp/js/dashboardAdc.js trunk/chorem-webmotion/src/main/webapp/js/employeeEdit.js trunk/chorem-webmotion/src/main/webapp/js/jquery-ui-timepicker-addon.js trunk/chorem-webmotion/src/main/webapp/js/jquery-ui-timepicker-fr.js trunk/chorem-webmotion/src/main/webapp/js/jquery.fn.gantt.js trunk/chorem-webmotion/src/main/webapp/js/jquery.maskedinput-1.3.js trunk/chorem-webmotion/src/main/webapp/js/js-hypercube.min.js trunk/chorem-webmotion/src/main/webapp/js/less-1.3.3.js trunk/chorem-webmotion/src/main/webapp/js/ng-grid-2.0.7.debug.js trunk/chorem-webmotion/src/main/webapp/js/ng-grid-2.0.7.min.js trunk/chorem-webmotion/src/main/webapp/js/ng-select2.js trunk/chorem-webmotion/src/main/webapp/js/ng-wikitty.js trunk/chorem-webmotion/src/main/webapp/js/projectPagination.js trunk/chorem-webmotion/src/main/webapp/js/salesFunnel.js trunk/chorem-webmotion/src/main/webapp/js/select2.min.js trunk/pom.xml trunk/src/site/resources/images/logos/argouml-logo.png trunk/src/site/resources/images/logos/jrst-logo.png trunk/src/site/resources/images/logos/restructuredtext-logo.png trunk/src/site/rst/calculations.rst trunk/src/site/rst/chorem-cdc.rst trunk/src/site/rst/doc-devel.rst trunk/src/site/rst/index.rst trunk/src/site/rst/requisite.rst trunk/src/site/site_fr.xml Property changes on: trunk/LICENSE.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/README.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/changelog.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/chorem-entities/LICENSE.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/chorem-entities/README.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/chorem-entities/changelog.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/chorem-entities/pom.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/chorem-entities/src/license/THIRD-PARTY.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/chorem-entities/src/main/java/com/inamik/utils/AbstractTableFormatter.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/chorem-entities/src/main/java/com/inamik/utils/SimpleTableFormatter.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/chorem-entities/src/main/java/com/inamik/utils/TableFormatter.java ___________________________________________________________________ Added: svn:eol-style + native Modified: trunk/chorem-entities/src/main/java/org/chorem/ChoremAction.java =================================================================== --- trunk/chorem-entities/src/main/java/org/chorem/ChoremAction.java 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-entities/src/main/java/org/chorem/ChoremAction.java 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ /* * #%L * Chorem entities - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 - 2012 CodeLutin * %% Property changes on: trunk/chorem-entities/src/main/java/org/chorem/ChoremAction.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-entities/src/main/java/org/chorem/ChoremClient.java =================================================================== --- trunk/chorem-entities/src/main/java/org/chorem/ChoremClient.java 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-entities/src/main/java/org/chorem/ChoremClient.java 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ /* * #%L * Chorem entities - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 - 2012 CodeLutin * %% Property changes on: trunk/chorem-entities/src/main/java/org/chorem/ChoremClient.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-entities/src/main/java/org/chorem/ChoremConfig.java =================================================================== --- trunk/chorem-entities/src/main/java/org/chorem/ChoremConfig.java 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-entities/src/main/java/org/chorem/ChoremConfig.java 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ /* * #%L * Chorem entities - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 - 2012 CodeLutin * %% Property changes on: trunk/chorem-entities/src/main/java/org/chorem/ChoremConfig.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-entities/src/main/java/org/chorem/ChoremConfigAction.java =================================================================== --- trunk/chorem-entities/src/main/java/org/chorem/ChoremConfigAction.java 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-entities/src/main/java/org/chorem/ChoremConfigAction.java 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ /* * #%L * Chorem entities - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 - 2012 CodeLutin * %% Property changes on: trunk/chorem-entities/src/main/java/org/chorem/ChoremConfigAction.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-entities/src/main/java/org/chorem/ChoremConfigOption.java =================================================================== --- trunk/chorem-entities/src/main/java/org/chorem/ChoremConfigOption.java 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-entities/src/main/java/org/chorem/ChoremConfigOption.java 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ /* * #%L * Chorem entities - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 - 2012 CodeLutin * %% Property changes on: trunk/chorem-entities/src/main/java/org/chorem/ChoremConfigOption.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-entities/src/main/java/org/chorem/ChoremMain.java =================================================================== --- trunk/chorem-entities/src/main/java/org/chorem/ChoremMain.java 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-entities/src/main/java/org/chorem/ChoremMain.java 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ /* * #%L * Chorem entities - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 - 2012 CodeLutin * %% Property changes on: trunk/chorem-entities/src/main/java/org/chorem/ChoremMain.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-entities/src/main/java/org/chorem/ChoremQueryHelper.java =================================================================== --- trunk/chorem-entities/src/main/java/org/chorem/ChoremQueryHelper.java 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-entities/src/main/java/org/chorem/ChoremQueryHelper.java 2014-04-09 14:29:44 UTC (rev 410) @@ -3,8 +3,8 @@ /* * #%L * Chorem entities - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 - 2012 CodeLutin * %% Property changes on: trunk/chorem-entities/src/main/java/org/chorem/ChoremQueryHelper.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-entities/src/main/java/org/chorem/ChoremQueryMaker.java =================================================================== --- trunk/chorem-entities/src/main/java/org/chorem/ChoremQueryMaker.java 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-entities/src/main/java/org/chorem/ChoremQueryMaker.java 2014-04-09 14:29:44 UTC (rev 410) @@ -3,8 +3,8 @@ /* * #%L * Chorem entities - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 - 2012 CodeLutin * %% Property changes on: trunk/chorem-entities/src/main/java/org/chorem/ChoremQueryMaker.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-entities/src/main/java/org/chorem/ChoremUtil.java =================================================================== --- trunk/chorem-entities/src/main/java/org/chorem/ChoremUtil.java 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-entities/src/main/java/org/chorem/ChoremUtil.java 2014-04-09 14:29:44 UTC (rev 410) @@ -3,8 +3,8 @@ /* * #%L * Chorem :: entities - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% Property changes on: trunk/chorem-entities/src/main/java/org/chorem/ChoremUtil.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-entities/src/main/java/org/chorem/ImportChoremTopia.java =================================================================== --- trunk/chorem-entities/src/main/java/org/chorem/ImportChoremTopia.java 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-entities/src/main/java/org/chorem/ImportChoremTopia.java 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ /* * #%L * Chorem entities - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 - 2012 CodeLutin * %% Property changes on: trunk/chorem-entities/src/main/java/org/chorem/ImportChoremTopia.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-entities/src/main/java/org/chorem/Saint.java =================================================================== --- trunk/chorem-entities/src/main/java/org/chorem/Saint.java 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-entities/src/main/java/org/chorem/Saint.java 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ /* * #%L * Chorem entities - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 - 2012 CodeLutin * %% Property changes on: trunk/chorem-entities/src/main/java/org/chorem/Saint.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-entities/src/main/java/org/chorem/entities/EmployeeMigration.java =================================================================== --- trunk/chorem-entities/src/main/java/org/chorem/entities/EmployeeMigration.java 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-entities/src/main/java/org/chorem/entities/EmployeeMigration.java 2014-04-09 14:29:44 UTC (rev 410) @@ -7,8 +7,8 @@ /* * #%L * Chorem entities - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 - 2012 CodeLutin * %% Property changes on: trunk/chorem-entities/src/main/java/org/chorem/entities/EmployeeMigration.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-entities/src/main/java/org/chorem/entities/ExpenseClaimStatus.java =================================================================== --- trunk/chorem-entities/src/main/java/org/chorem/entities/ExpenseClaimStatus.java 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-entities/src/main/java/org/chorem/entities/ExpenseClaimStatus.java 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ /* * #%L * Chorem entities - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 - 2012 CodeLutin * %% Property changes on: trunk/chorem-entities/src/main/java/org/chorem/entities/ExpenseClaimStatus.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-entities/src/main/java/org/chorem/entities/InvoiceMigration.java =================================================================== --- trunk/chorem-entities/src/main/java/org/chorem/entities/InvoiceMigration.java 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-entities/src/main/java/org/chorem/entities/InvoiceMigration.java 2014-04-09 14:29:44 UTC (rev 410) @@ -7,8 +7,8 @@ /* * #%L * Chorem entities - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 - 2012 CodeLutin * %% Property changes on: trunk/chorem-entities/src/main/java/org/chorem/entities/InvoiceMigration.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-entities/src/main/java/org/chorem/entities/InvoiceStatus.java =================================================================== --- trunk/chorem-entities/src/main/java/org/chorem/entities/InvoiceStatus.java 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-entities/src/main/java/org/chorem/entities/InvoiceStatus.java 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ /* * #%L * Chorem entities - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 - 2012 CodeLutin * %% Property changes on: trunk/chorem-entities/src/main/java/org/chorem/entities/InvoiceStatus.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-entities/src/main/java/org/chorem/entities/InvoiceableUtil.java =================================================================== --- trunk/chorem-entities/src/main/java/org/chorem/entities/InvoiceableUtil.java 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-entities/src/main/java/org/chorem/entities/InvoiceableUtil.java 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ /* * #%L * Chorem entities - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 - 2012 CodeLutin * %% Property changes on: trunk/chorem-entities/src/main/java/org/chorem/entities/InvoiceableUtil.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-entities/src/main/java/org/chorem/entities/Quotation18Migration.java =================================================================== --- trunk/chorem-entities/src/main/java/org/chorem/entities/Quotation18Migration.java 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-entities/src/main/java/org/chorem/entities/Quotation18Migration.java 2014-04-09 14:29:44 UTC (rev 410) @@ -3,8 +3,8 @@ /* * #%L * Chorem :: entities - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% Property changes on: trunk/chorem-entities/src/main/java/org/chorem/entities/Quotation18Migration.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-entities/src/main/java/org/chorem/entities/QuotationMigration.java =================================================================== --- trunk/chorem-entities/src/main/java/org/chorem/entities/QuotationMigration.java 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-entities/src/main/java/org/chorem/entities/QuotationMigration.java 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ /* * #%L * Chorem entities - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 - 2012 CodeLutin * %% Property changes on: trunk/chorem-entities/src/main/java/org/chorem/entities/QuotationMigration.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-entities/src/main/java/org/chorem/entities/QuotationStatus.java =================================================================== --- trunk/chorem-entities/src/main/java/org/chorem/entities/QuotationStatus.java 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-entities/src/main/java/org/chorem/entities/QuotationStatus.java 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ /* * #%L * Chorem entities - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 - 2012 CodeLutin * %% Property changes on: trunk/chorem-entities/src/main/java/org/chorem/entities/QuotationStatus.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-entities/src/main/java/org/chorem/entities/TaskStatus.java =================================================================== --- trunk/chorem-entities/src/main/java/org/chorem/entities/TaskStatus.java 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-entities/src/main/java/org/chorem/entities/TaskStatus.java 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ /* * #%L * Chorem entities - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 - 2012 CodeLutin * %% Property changes on: trunk/chorem-entities/src/main/java/org/chorem/entities/TaskStatus.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-entities/src/main/java/org/chorem/entities/VacationMigration.java =================================================================== --- trunk/chorem-entities/src/main/java/org/chorem/entities/VacationMigration.java 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-entities/src/main/java/org/chorem/entities/VacationMigration.java 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ /* * #%L * Chorem entities - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 - 2012 CodeLutin * %% Property changes on: trunk/chorem-entities/src/main/java/org/chorem/entities/VacationMigration.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-entities/src/main/java/org/chorem/entities/VacationStatus.java =================================================================== --- trunk/chorem-entities/src/main/java/org/chorem/entities/VacationStatus.java 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-entities/src/main/java/org/chorem/entities/VacationStatus.java 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ /* * #%L * Chorem entities - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 - 2012 CodeLutin * %% Property changes on: trunk/chorem-entities/src/main/java/org/chorem/entities/VacationStatus.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-entities/src/main/java/org/chorem/project/AdcCalculation.java =================================================================== --- trunk/chorem-entities/src/main/java/org/chorem/project/AdcCalculation.java 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-entities/src/main/java/org/chorem/project/AdcCalculation.java 2014-04-09 14:29:44 UTC (rev 410) @@ -3,8 +3,8 @@ /* * #%L * Chorem :: entities - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% Property changes on: trunk/chorem-entities/src/main/java/org/chorem/project/AdcCalculation.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-entities/src/main/java/org/chorem/project/Calculation.java =================================================================== --- trunk/chorem-entities/src/main/java/org/chorem/project/Calculation.java 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-entities/src/main/java/org/chorem/project/Calculation.java 2014-04-09 14:29:44 UTC (rev 410) @@ -3,8 +3,8 @@ /* * #%L * Chorem :: entities - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% Property changes on: trunk/chorem-entities/src/main/java/org/chorem/project/Calculation.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-entities/src/main/java/org/chorem/project/QuotationCalculation.java =================================================================== --- trunk/chorem-entities/src/main/java/org/chorem/project/QuotationCalculation.java 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-entities/src/main/java/org/chorem/project/QuotationCalculation.java 2014-04-09 14:29:44 UTC (rev 410) @@ -3,8 +3,8 @@ /* * #%L * Chorem :: entities - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% Property changes on: trunk/chorem-entities/src/main/java/org/chorem/project/QuotationCalculation.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-entities/src/main/java/org/chorem/project/TaskCalculation.java =================================================================== --- trunk/chorem-entities/src/main/java/org/chorem/project/TaskCalculation.java 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-entities/src/main/java/org/chorem/project/TaskCalculation.java 2014-04-09 14:29:44 UTC (rev 410) @@ -3,8 +3,8 @@ /* * #%L * Chorem :: entities - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% Property changes on: trunk/chorem-entities/src/main/java/org/chorem/project/TaskCalculation.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-entities/src/main/java/org/chorem/project/TotalQuotationCalculation.java =================================================================== --- trunk/chorem-entities/src/main/java/org/chorem/project/TotalQuotationCalculation.java 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-entities/src/main/java/org/chorem/project/TotalQuotationCalculation.java 2014-04-09 14:29:44 UTC (rev 410) @@ -3,8 +3,8 @@ /* * #%L * Chorem :: entities - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% Property changes on: trunk/chorem-entities/src/main/java/org/chorem/project/TotalQuotationCalculation.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-entities/src/main/resources/chorem.properties =================================================================== --- trunk/chorem-entities/src/main/resources/chorem.properties 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-entities/src/main/resources/chorem.properties 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ ### # #%L # Chorem entities -# $Id:$ -# $HeadURL:$ +# $Id$ +# $HeadURL$ # %% # Copyright (C) 2011 - 2012 CodeLutin # %% Property changes on: trunk/chorem-entities/src/main/resources/chorem.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/chorem-entities/src/main/resources/log4j.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-entities/src/main/xmi/chorem-model.properties =================================================================== --- trunk/chorem-entities/src/main/xmi/chorem-model.properties 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-entities/src/main/xmi/chorem-model.properties 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ ### # #%L # Chorem entities -# $Id:$ -# $HeadURL:$ +# $Id$ +# $HeadURL$ # %% # Copyright (C) 2011 - 2012 CodeLutin # %% @@ -39,7 +39,7 @@ # ADC # org.chorem.entities.ADC.class.tagvalue.version=1.0 -org.chorem.entities.Cancelled.class.tagvalue.toString=%ADC.employeeHR|noemployee%s %ADC.year|noyear%s %ADC.value|novalue$s +org.chorem.entities.ADC.class.tagvalue.toString=%ADC.employeeHR|noemployee%s %ADC.year|noyear%s %ADC.value|novalue$s # @@ -189,6 +189,22 @@ org.chorem.entities.ExpenseClaim.attribute.status.tagvalue.default=UNCHARGEABLE # +# ExpenseAccount +# +org.chorem.entities.ExpenseAccount.class.tagvalue.version=1.0 +org.chorem.entities.ExpenseAccount.class.tagvalue.preload=ExpenseAccount.employee +org.chorem.entities.ExpenseAccount.class.tagvalue.toString=%ExpenseAccount.employee$s - %ExpenseAccount.month$s/%ExpenseAccount.year$s +org.chorem.entities.ExpenseAccount.class.tagvalue.sortOrder=ExpenseAccount.year,ExpenseAccount.month + +# +# ExpenseAccountEntry +# +org.chorem.entities.ExpenseAccountEntry.class.tagvalue.version=1.0 +org.chorem.entities.ExpenseAccountEntry.class.tagvalue.toString=%FinancialTransaction.reference$tF-%ExpenseAccountEntry.justificationNumber$tF +org.chorem.entities.ExpenseAccountEntry.class.tagvalue.preload=FinancialTransaction.beneficiary;FinancialTransaction.category +org.chorem.entities.ExpenseAccountEntry.class.tagvalue.sortOrder=ExpenseAccountEntry.date + +# # Mission (a mettre ici) # # Property changes on: trunk/chorem-entities/src/main/xmi/chorem-model.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-entities/src/main/xmi/chorem-model.zargo =================================================================== (Binary files differ) Property changes on: trunk/chorem-entities/src/main/xmi/chorem-model.zargo ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/chorem-entities/src/main/xmi/vacations.rst =================================================================== --- trunk/chorem-entities/src/main/xmi/vacations.rst 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-entities/src/main/xmi/vacations.rst 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ .. - .. * #%L .. * Chorem entities -.. * $Id:$ -.. * $HeadURL:$ +.. * $Id$ +.. * $HeadURL$ .. * %% .. * Copyright (C) 2011 - 2012 CodeLutin .. * %% Property changes on: trunk/chorem-entities/src/main/xmi/vacations.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/chorem-entities/src/site/rst/chorem-entities-base.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/chorem-entities/src/site/rst/chorem-entities-billy.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/chorem-entities/src/site/rst/chorem-entities-bonzoms.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/chorem-entities/src/site/rst/chorem-entities-gepeto.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/chorem-entities/src/site/rst/dataModel.rst =================================================================== --- trunk/chorem-entities/src/site/rst/dataModel.rst 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-entities/src/site/rst/dataModel.rst 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ .. - .. * #%L .. * Chorem entities -.. * $Id:$ -.. * $HeadURL:$ +.. * $Id$ +.. * $HeadURL$ .. * %% .. * Copyright (C) 2011 - 2012 CodeLutin .. * %% Property changes on: trunk/chorem-entities/src/site/rst/dataModel.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-entities/src/site/rst/gepeto.rst =================================================================== --- trunk/chorem-entities/src/site/rst/gepeto.rst 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-entities/src/site/rst/gepeto.rst 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ .. - .. * #%L .. * Chorem :: entities -.. * $Id:$ -.. * $HeadURL:$ +.. * $Id$ +.. * $HeadURL$ .. * %% .. * Copyright (C) 2011 - 2014 CodeLutin .. * %% Property changes on: trunk/chorem-entities/src/site/rst/gepeto.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-entities/src/test/java/org/chorem/ChoremUtilTest.java =================================================================== --- trunk/chorem-entities/src/test/java/org/chorem/ChoremUtilTest.java 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-entities/src/test/java/org/chorem/ChoremUtilTest.java 2014-04-09 14:29:44 UTC (rev 410) @@ -3,8 +3,8 @@ /* * #%L * Chorem :: entities - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% Property changes on: trunk/chorem-entities/src/test/java/org/chorem/ChoremUtilTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-entities/src/test/java/org/chorem/entities/InvoiceableUtilTest.java =================================================================== --- trunk/chorem-entities/src/test/java/org/chorem/entities/InvoiceableUtilTest.java 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-entities/src/test/java/org/chorem/entities/InvoiceableUtilTest.java 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ /* * #%L * Chorem entities - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 - 2012 CodeLutin * %% Property changes on: trunk/chorem-entities/src/test/java/org/chorem/entities/InvoiceableUtilTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/chorem-web/LICENSE.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/chorem-web/README.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/chorem-web/changelog.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/chorem-web/pom.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/chorem-web/src/main/i18n/jsp.rules ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/chorem-web/src/main/java/org/chorem/ChoremSession.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/chorem-web/src/main/java/org/chorem/ChoremUtil.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/chorem-web/src/main/java/org/chorem/ContactDetailsConstants.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/chorem-web/src/main/java/org/chorem/JspUtils.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/chorem-web/src/main/java/org/chorem/action/ChoremBaseAction.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/chorem-web/src/main/java/org/chorem/action/EntitySearchJsonAction.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/chorem-web/src/main/java/org/chorem/action/HomeAction.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/chorem-web/src/main/java/org/chorem/action/SelectWikittyComponentAction.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/chorem-web/src/main/java/org/chorem/billy/action/QuotationAction.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/chorem-web/src/main/java/org/chorem/gepeto/ProjectOrderFull.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/chorem-web/src/main/java/org/chorem/gepeto/action/ProjectAction.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/chorem-web/src/main/java/org/chorem/gepeto/action/ProjectOrderAction.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/chorem-web/src/main/java/org/chorem/gepeto/action/TaskAction.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-web/src/main/resources/freemarker.properties =================================================================== --- trunk/chorem-web/src/main/resources/freemarker.properties 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-web/src/main/resources/freemarker.properties 2014-04-09 14:29:44 UTC (rev 410) @@ -2,8 +2,8 @@ # #%L # BOW UI # -# $Id: freemarker.properties 333 2011-08-31 12:32:26Z bpoussin $ -# $HeadURL: http://svn.chorem.org/svn/bow/trunk/bow-ui/src/main/resources/freemarker.pr… $ +# $Id$ +# $HeadURL$ # %% # Copyright (C) 2010 - 2011 CodeLutin # %% Property changes on: trunk/chorem-web/src/main/resources/freemarker.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/chorem-web/src/main/resources/i18n/chorem-web_en_GB.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/chorem-web/src/main/resources/i18n/chorem-web_fr_FR.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/chorem-web/src/main/resources/org/chorem/billy/action/QuotationAction-addQuotation-validation.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/chorem-web/src/main/resources/org/chorem/billy/action/QuotationAction-modifyQuotation-validation.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/ProjectAction-addProject-validation.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/ProjectAction-modifyProject-validation.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/ProjectOrderAction-addProjectOrder-validation.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/TaskAction-addTask-validation.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/chorem-web/src/main/resources/struts.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/chorem-web/src/main/resources/struts.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/chorem-web/src/main/webapp/WEB-INF/decorators/billy.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/chorem-web/src/main/webapp/WEB-INF/decorators/bonzoms.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/chorem-web/src/main/webapp/WEB-INF/decorators/cash.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/chorem-web/src/main/webapp/WEB-INF/decorators/gepeto.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/chorem-web/src/main/webapp/WEB-INF/decorators/main.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/chorem-web/src/main/webapp/WEB-INF/decorators.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/billy/addQuotation.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/billy/home.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/billy/menu.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/billy/quotationDetails.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/companies.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/menu.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/persons.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/common/inc/footer.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/common/inc/header.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/common/selectWikittyComponent.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/addProject.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/addProjectOrder.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/addTask.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/menu.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/projectDetails.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/projectOrderDetails.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/projects.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/projectsByYear.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/projectsWithoutQuotation.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/results.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/home.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/chorem-web/src/main/webapp/WEB-INF/sitemesh.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/chorem-web/src/main/webapp/WEB-INF/web.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/chorem-web/src/main/webapp/css/style.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/chorem-web/src/main/webapp/js/chorem.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-web/src/main/webapp/template/simple/a-close.ftl =================================================================== --- trunk/chorem-web/src/main/webapp/template/simple/a-close.ftl 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-web/src/main/webapp/template/simple/a-close.ftl 2014-04-09 14:29:44 UTC (rev 410) @@ -1,6 +1,6 @@ <#-- /* - * $Id: a-close.ftl 224 2011-02-25 16:57:19Z kmorin $ + * $Id$ * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file Property changes on: trunk/chorem-web/src/main/webapp/template/simple/a-close.ftl ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-web/src/main/webapp/template/simple/form-common.ftl =================================================================== --- trunk/chorem-web/src/main/webapp/template/simple/form-common.ftl 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-web/src/main/webapp/template/simple/form-common.ftl 2014-04-09 14:29:44 UTC (rev 410) @@ -1,6 +1,6 @@ <#-- /* - * $Id: form-common.ftl 192 2011-02-14 14:53:06Z tchemit $ + * $Id$ * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file Property changes on: trunk/chorem-web/src/main/webapp/template/simple/form-common.ftl ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-web/src/main/webapp/template/xhtml/controlheader-core.ftl =================================================================== --- trunk/chorem-web/src/main/webapp/template/xhtml/controlheader-core.ftl 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-web/src/main/webapp/template/xhtml/controlheader-core.ftl 2014-04-09 14:29:44 UTC (rev 410) @@ -1,6 +1,6 @@ <#-- /* - * $Id: controlheader-core.ftl 192 2011-02-14 14:53:06Z tchemit $ + * $Id$ * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file Property changes on: trunk/chorem-web/src/main/webapp/template/xhtml/controlheader-core.ftl ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-web/src/main/webapp/template/xhtml/file.ftl =================================================================== --- trunk/chorem-web/src/main/webapp/template/xhtml/file.ftl 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-web/src/main/webapp/template/xhtml/file.ftl 2014-04-09 14:29:44 UTC (rev 410) @@ -1,6 +1,6 @@ <#-- /* - * $Id: file.ftl 192 2011-02-14 14:53:06Z tchemit $ + * $Id$ * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file Property changes on: trunk/chorem-web/src/main/webapp/template/xhtml/file.ftl ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-web/src/main/webapp/template/xhtml/form-close.ftl =================================================================== --- trunk/chorem-web/src/main/webapp/template/xhtml/form-close.ftl 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-web/src/main/webapp/template/xhtml/form-close.ftl 2014-04-09 14:29:44 UTC (rev 410) @@ -1,6 +1,6 @@ <#-- /* - * $Id: form-close.ftl 192 2011-02-14 14:53:06Z tchemit $ + * $Id$ * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file Property changes on: trunk/chorem-web/src/main/webapp/template/xhtml/form-close.ftl ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-web/src/main/webapp/template/xhtml/form.ftl =================================================================== --- trunk/chorem-web/src/main/webapp/template/xhtml/form.ftl 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-web/src/main/webapp/template/xhtml/form.ftl 2014-04-09 14:29:44 UTC (rev 410) @@ -1,6 +1,6 @@ <#-- /* - * $Id: form.ftl 192 2011-02-14 14:53:06Z tchemit $ + * $Id$ * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file Property changes on: trunk/chorem-web/src/main/webapp/template/xhtml/form.ftl ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-web/src/main/webapp/template/xhtml/password.ftl =================================================================== --- trunk/chorem-web/src/main/webapp/template/xhtml/password.ftl 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-web/src/main/webapp/template/xhtml/password.ftl 2014-04-09 14:29:44 UTC (rev 410) @@ -1,6 +1,6 @@ <#-- /* - * $Id: password.ftl 192 2011-02-14 14:53:06Z tchemit $ + * $Id$ * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file Property changes on: trunk/chorem-web/src/main/webapp/template/xhtml/password.ftl ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/chorem-web/src/main/webapp/template/xhtml/submit-close.ftl ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-web/src/main/webapp/template/xhtml/submit.ftl =================================================================== --- trunk/chorem-web/src/main/webapp/template/xhtml/submit.ftl 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-web/src/main/webapp/template/xhtml/submit.ftl 2014-04-09 14:29:44 UTC (rev 410) @@ -1,6 +1,6 @@ <#-- /* - * $Id: submit.ftl 192 2011-02-14 14:53:06Z tchemit $ + * $Id$ * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file Property changes on: trunk/chorem-web/src/main/webapp/template/xhtml/submit.ftl ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-web/src/main/webapp/template/xhtml/text.ftl =================================================================== --- trunk/chorem-web/src/main/webapp/template/xhtml/text.ftl 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-web/src/main/webapp/template/xhtml/text.ftl 2014-04-09 14:29:44 UTC (rev 410) @@ -1,6 +1,6 @@ <#-- /* - * $Id: text.ftl 192 2011-02-14 14:53:06Z tchemit $ + * $Id$ * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file Property changes on: trunk/chorem-web/src/main/webapp/template/xhtml/text.ftl ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-web/src/main/webapp/template/xhtml/textarea.ftl =================================================================== --- trunk/chorem-web/src/main/webapp/template/xhtml/textarea.ftl 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-web/src/main/webapp/template/xhtml/textarea.ftl 2014-04-09 14:29:44 UTC (rev 410) @@ -1,6 +1,6 @@ <#-- /* - * $Id: textarea.ftl 590812 2007-10-31 20:32:54Z apetrelli $ + * $Id$ * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file Property changes on: trunk/chorem-web/src/main/webapp/template/xhtml/textarea.ftl ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/chorem-webmotion/LICENSE.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/chorem-webmotion/README.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/chorem-webmotion/changelog.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/chorem-webmotion/pom.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/chorem-webmotion/src/doc/REST_API_Timer.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/jetty/jetty-context.xml =================================================================== --- trunk/chorem-webmotion/src/jetty/jetty-context.xml 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/jetty/jetty-context.xml 2014-04-09 14:29:44 UTC (rev 410) @@ -2,8 +2,8 @@ <!-- #%L Chorem webmotion - $Id:$ - $HeadURL:$ + $Id$ + $HeadURL$ %% Copyright (C) 2011 - 2012 CodeLutin %% Property changes on: trunk/chorem-webmotion/src/jetty/jetty-context.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/chorem-webmotion/src/license/THIRD-PARTY.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/chorem-webmotion/src/main/i18n/jsp.rules ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/ChoremDateUtil.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/ChoremDateUtil.java 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/ChoremDateUtil.java 2014-04-09 14:29:44 UTC (rev 410) @@ -7,8 +7,8 @@ /* * #%L * Chorem webmotion - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 - 2012 CodeLutin * %% Property changes on: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/ChoremDateUtil.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/ChoremWebMotionUtil.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/ChoremWebMotionUtil.java 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/ChoremWebMotionUtil.java 2014-04-09 14:29:44 UTC (rev 410) @@ -2,8 +2,8 @@ /* * #%L * Chorem webmotion - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 - 2012 CodeLutin * %% Property changes on: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/ChoremWebMotionUtil.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/PaginatedResult.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/PaginatedResult.java 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/PaginatedResult.java 2014-04-09 14:29:44 UTC (rev 410) @@ -3,8 +3,8 @@ /* * #%L * Chorem :: webmotion - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% Property changes on: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/PaginatedResult.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/AdcDashboardAction.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/AdcDashboardAction.java 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/AdcDashboardAction.java 2014-04-09 14:29:44 UTC (rev 410) @@ -3,8 +3,8 @@ /* * #%L * Chorem :: webmotion - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% Property changes on: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/AdcDashboardAction.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/AdminAction.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/AdminAction.java 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/AdminAction.java 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ /* * #%L * Chorem webmotion - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 - 2012 CodeLutin * %% Property changes on: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/AdminAction.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/BIAction.java ___________________________________________________________________ Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/DashboardAction.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/DashboardAction.java 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/DashboardAction.java 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ /* * #%L * Chorem webmotion - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 - 2012 CodeLutin * %% Property changes on: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/DashboardAction.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/DashboardHRAction.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/DashboardHRAction.java 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/DashboardHRAction.java 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ /* * #%L * Chorem webmotion - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 - 2012 CodeLutin * %% Property changes on: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/DashboardHRAction.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/EmployeeEditAction.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/EmployeeEditAction.java 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/EmployeeEditAction.java 2014-04-09 14:29:44 UTC (rev 410) @@ -3,8 +3,8 @@ /* * #%L * Chorem :: webmotion - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% Property changes on: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/EmployeeEditAction.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/GenericAction.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/GenericAction.java 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/GenericAction.java 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ /* * #%L * Chorem webmotion - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 - 2012 CodeLutin * %% Property changes on: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/GenericAction.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/HrAction.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/HrAction.java 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/HrAction.java 2014-04-09 14:29:44 UTC (rev 410) @@ -4,8 +4,8 @@ /* * #%L * Chorem webmotion - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 - 2012 CodeLutin * %% Property changes on: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/HrAction.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/MapWithDefault.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/MapWithDefault.java 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/MapWithDefault.java 2014-04-09 14:29:44 UTC (rev 410) @@ -3,8 +3,8 @@ /* * #%L * Chorem webmotion - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 - 2012 CodeLutin * %% Property changes on: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/MapWithDefault.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/WikittyRestAction.java ___________________________________________________________________ Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/AccountAction.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/AccountAction.java 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/AccountAction.java 2014-04-09 14:29:44 UTC (rev 410) @@ -3,8 +3,8 @@ /* * #%L * Chorem :: webmotion - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% Property changes on: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/AccountAction.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/ContactRowForExport.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/ContactRowForExport.java 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/ContactRowForExport.java 2014-04-09 14:29:44 UTC (rev 410) @@ -3,8 +3,8 @@ /* * #%L * Chorem :: webmotion - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% Property changes on: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/ContactRowForExport.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/ContactRowForExportModel.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/ContactRowForExportModel.java 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/ContactRowForExportModel.java 2014-04-09 14:29:44 UTC (rev 410) @@ -3,8 +3,8 @@ /* * #%L * Chorem :: webmotion - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% Property changes on: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/ContactRowForExportModel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/ExportAction.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/ExportAction.java 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/ExportAction.java 2014-04-09 14:29:44 UTC (rev 410) @@ -3,8 +3,8 @@ /* * #%L * Chorem :: webmotion - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% Property changes on: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/ExportAction.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/QuotationAction.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/QuotationAction.java 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/QuotationAction.java 2014-04-09 14:29:44 UTC (rev 410) @@ -3,8 +3,8 @@ /* * #%L * Chorem :: webmotion - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% Property changes on: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/QuotationAction.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/financial/ExpenseAccountAction.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/financial/ExpenseAccountAction.java (rev 0) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/financial/ExpenseAccountAction.java 2014-04-09 14:29:44 UTC (rev 410) @@ -0,0 +1,194 @@ +package org.chorem.webmotion.actions.financial; + +/* + * #%L + * Chorem :: webmotion + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + +import java.util.ArrayList; +import java.util.Calendar; +import java.util.Collection; +import java.util.Date; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Random; +import java.util.Set; + +import com.google.common.base.Function; +import com.google.common.collect.Collections2; +import com.google.common.collect.Lists; +import org.chorem.ChoremClient; +import org.chorem.entities.CategoryImpl; +import org.chorem.entities.Employee; +import org.chorem.entities.EmployeeImpl; +import org.chorem.entities.ExpenseAccount; +import org.chorem.entities.ExpenseAccountImpl; +import org.chorem.webmotion.PaginatedResult; +import org.chorem.webmotion.bean.financial.ExpenseAccountBean; +import org.chorem.webmotion.bean.financial.ExpenseAccountEntryBean; +import org.debux.webmotion.server.WebMotionController; +import org.debux.webmotion.server.call.Call; +import org.debux.webmotion.server.render.Render; +import org.nuiton.util.DateUtil; +import org.nuiton.wikitty.query.WikittyQuery; +import org.nuiton.wikitty.query.WikittyQueryMaker; +import org.nuiton.wikitty.query.WikittyQueryResult; + +/** + * @author ymartel <martel(a)codelutin.com> + */ +public class ExpenseAccountAction extends WebMotionController { + + public PaginatedResult<ExpenseAccountBean> findAllExpenseAccounts(ChoremClient client, Integer year, Integer mounth, int page, int count) { + + if (mounth == null) { + mounth = DateUtil.getMonth(new Date()); + } + if (year == null) { + Calendar calendar = Calendar.getInstance(); + year = calendar.get(Calendar.YEAR); + } + + WikittyQuery totalQuery = new WikittyQueryMaker() + .select().count(ExpenseAccount.ELEMENT_FIELD_EXPENSEACCOUNT_MONTH).where().and() + .exteq(ExpenseAccount.EXT_EXPENSEACCOUNT) + .eq(ExpenseAccount.ELEMENT_FIELD_EXPENSEACCOUNT_MONTH, mounth) + .eq(ExpenseAccount.ELEMENT_FIELD_EXPENSEACCOUNT_YEAR, year) + .end(); + + Integer nbExpenseAccounts = client.findByQuery(Integer.class, totalQuery); + + PaginatedResult<ExpenseAccountBean> paginatedResult; + if (nbExpenseAccounts > 0) { + + WikittyQuery expAccountsQuery = new WikittyQueryMaker() + .where().and() + .exteq(ExpenseAccount.EXT_EXPENSEACCOUNT) + .eq(ExpenseAccount.ELEMENT_FIELD_EXPENSEACCOUNT_MONTH, mounth) + .eq(ExpenseAccount.ELEMENT_FIELD_EXPENSEACCOUNT_YEAR, year) + .end() + .setOffset((page - 1) * count) + .setLimit(page * count); + + WikittyQueryResult<ExpenseAccount> expenseAccounts = client.findAllByQuery(ExpenseAccount.class, expAccountsQuery); + + List<ExpenseAccount> expenseAccountList = expenseAccounts.getAll(); + Collection<ExpenseAccountBean> expenseAccountBeans = Collections2.transform(expenseAccountList, TRANSFORM_EXPENSE_ACCOUNT_TO_BEAN); + paginatedResult = new PaginatedResult<>(Lists.newArrayList(expenseAccountBeans), page, count, nbExpenseAccounts); + + } else { + + //XXX ymartel 2014/04/09 : create fake datas for test + Employee employee = client.findAllByExample(new EmployeeImpl(), 0, 1).get(0); + ExpenseAccountBean fakeOne = new ExpenseAccountBean(); + fakeOne.setId("fake"); + fakeOne.setMonth(03); + fakeOne.setYear(2014); + fakeOne.setEmployeeName(employee.toString()); + fakeOne.setEmployeeId(employee.getWikittyId()); + ExpenseAccountBean fakeTwo = new ExpenseAccountBean(); + fakeTwo.setId("fake"); + fakeTwo.setMonth(mounth); + fakeTwo.setYear(year); + fakeTwo.setEmployeeName(employee.toString()); + fakeTwo.setEmployeeId(employee.getWikittyId()); + ArrayList<ExpenseAccountBean> expenseAccounts = new ArrayList<>(); + expenseAccounts.add(fakeOne); + expenseAccounts.add(fakeTwo); + paginatedResult = new PaginatedResult<>(expenseAccounts, 1, count, 0); + } + + return paginatedResult; + } + + public void saveExpenseAccount(ChoremClient client, String expenseAccountId, Call call) { + ExpenseAccount expenseAccount = client.restore(ExpenseAccount.class, expenseAccountId); + if (expenseAccount == null) { + expenseAccount = new ExpenseAccountImpl(); + } + Map<String,Object> extractParameters = call.getExtractParameters(); + String contextPath = call.getContext().getServletContext().getContextPath(); + contextPath.length(); + } + + public Render findExpenseAccount(ChoremClient client, String expenseAccountId) { + ExpenseAccount expenseAccount = client.restore(ExpenseAccount.class, expenseAccountId); + Set<ExpenseAccountEntryBean> expenseAccountEntries; + WikittyQueryResult<CategoryImpl> categoriesResult = client.findAllByExample(new CategoryImpl(), 0, 10); + List<CategoryImpl> categories = categoriesResult.getAll(); + + ExpenseAccountBean expenseAccountBean = null; + + if (expenseAccount == null) { + expenseAccountBean = new ExpenseAccountBean(); + + //XXX ymartel 2014/04/08 Some Fake datas, just for test + Employee employee = client.findAllByExample(new EmployeeImpl(), 0, 1).get(0); + expenseAccountBean.setEmployeeName(employee.toString()); + expenseAccountBean.setEmployeeId(employee.getWikittyId()); + + expenseAccountBean.setMonth(3); + expenseAccountBean.setYear(2014); + + int capacity = categories.size(); + expenseAccountEntries = new HashSet<>(capacity); + Random random = new Random(); + for (CategoryImpl category : categories) { + ExpenseAccountEntryBean expenseAccountEntry = new ExpenseAccountEntryBean(); + int randomInt = random.nextInt(capacity); + expenseAccountEntry.setEmittedDate(DateUtil.createDate(01, 03, 2014).getTime()); + expenseAccountEntry.setDescription("blabla" + randomInt); + expenseAccountEntry.setJustificationNumber(String.valueOf(randomInt)); + double amount = random.nextDouble(); + expenseAccountEntry.setAmount(amount); + double vat = random.nextDouble(); + expenseAccountEntry.setVAT(vat); + expenseAccountEntry.setTotal(amount + vat); + expenseAccountEntry.setCategoryName(category.toString()); + expenseAccountEntry.setProjectName("aucun"); + if (random.nextBoolean()) { + expenseAccountEntry.setPaymentDate(DateUtil.createDate(31, 03, 2014).getTime()); + } + expenseAccountEntries.add(expenseAccountEntry); + } + expenseAccountBean.setExpenseAccountEntries(expenseAccountEntries); + + } + + return renderView("financial/expenseAccountView.jsp", "expenseAccount", expenseAccountBean); + } + + + Function<ExpenseAccount, ExpenseAccountBean> TRANSFORM_EXPENSE_ACCOUNT_TO_BEAN = new Function<ExpenseAccount, ExpenseAccountBean>() { + @Override + public ExpenseAccountBean apply(ExpenseAccount expenseAccount) { + ExpenseAccountBean expenseAccountBean = new ExpenseAccountBean(); + expenseAccountBean.setId(expenseAccount.getWikittyId()); + Employee employee = expenseAccount.getEmployee(false); + expenseAccountBean.setEmployeeName(employee != null ? employee.toString() : null); + expenseAccountBean.setEmployeeId(employee != null ? employee.getWikittyId() : null); + expenseAccountBean.setMonth(expenseAccount.getMonth()); + expenseAccountBean.setYear(expenseAccount.getYear()); + return expenseAccountBean; + } + }; +} Property changes on: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/financial/ExpenseAccountAction.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/DashboardProjectAction.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/DashboardProjectAction.java 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/DashboardProjectAction.java 2014-04-09 14:29:44 UTC (rev 410) @@ -3,8 +3,8 @@ /* * #%L * Chorem :: webmotion - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% Property changes on: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/DashboardProjectAction.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/GanttAction.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/GanttAction.java 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/GanttAction.java 2014-04-09 14:29:44 UTC (rev 410) @@ -3,8 +3,8 @@ /* * #%L * Chorem :: webmotion - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% Property changes on: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/GanttAction.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/ProjectsAction.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/ProjectsAction.java 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/ProjectsAction.java 2014-04-09 14:29:44 UTC (rev 410) @@ -3,8 +3,8 @@ /* * #%L * Chorem :: webmotion - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% Property changes on: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/ProjectsAction.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/QuotationData.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/QuotationData.java 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/QuotationData.java 2014-04-09 14:29:44 UTC (rev 410) @@ -3,8 +3,8 @@ /* * #%L * Chorem :: webmotion - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% Property changes on: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/QuotationData.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/QuotationStatusAction.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/QuotationStatusAction.java 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/QuotationStatusAction.java 2014-04-09 14:29:44 UTC (rev 410) @@ -3,8 +3,8 @@ /* * #%L * Chorem :: webmotion - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% Property changes on: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/QuotationStatusAction.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/TaskData.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/TaskData.java 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/TaskData.java 2014-04-09 14:29:44 UTC (rev 410) @@ -3,8 +3,8 @@ /* * #%L * Chorem :: webmotion - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% Property changes on: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/TaskData.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/AcceptedQuotationsReportAction.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/AcceptedQuotationsReportAction.java 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/AcceptedQuotationsReportAction.java 2014-04-09 14:29:44 UTC (rev 410) @@ -3,8 +3,8 @@ /* * #%L * Chorem :: webmotion - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% Property changes on: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/AcceptedQuotationsReportAction.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/AccountSalesReportAction.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/AccountSalesReportAction.java 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/AccountSalesReportAction.java 2014-04-09 14:29:44 UTC (rev 410) @@ -3,8 +3,8 @@ /* * #%L * Chorem :: webmotion - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% Property changes on: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/AccountSalesReportAction.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/FunnelAction.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/FunnelAction.java 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/FunnelAction.java 2014-04-09 14:29:44 UTC (rev 410) @@ -3,8 +3,8 @@ /* * #%L * Chorem :: webmotion - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% Property changes on: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/FunnelAction.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/ProjectSalesReportAction.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/ProjectSalesReportAction.java 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/ProjectSalesReportAction.java 2014-04-09 14:29:44 UTC (rev 410) @@ -3,8 +3,8 @@ /* * #%L * Chorem :: webmotion - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% Property changes on: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/ProjectSalesReportAction.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/QuotationYearData.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/QuotationYearData.java 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/QuotationYearData.java 2014-04-09 14:29:44 UTC (rev 410) @@ -3,8 +3,8 @@ /* * #%L * Chorem :: webmotion - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% Property changes on: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/QuotationYearData.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesAction.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesAction.java 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesAction.java 2014-04-09 14:29:44 UTC (rev 410) @@ -3,8 +3,8 @@ /* * #%L * Chorem webmotion - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 - 2012 CodeLutin * %% Property changes on: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesAction.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesData.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesData.java 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesData.java 2014-04-09 14:29:44 UTC (rev 410) @@ -3,8 +3,8 @@ /* * #%L * Chorem :: webmotion - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% Property changes on: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesData.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesPerAccountReportAction.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesPerAccountReportAction.java 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesPerAccountReportAction.java 2014-04-09 14:29:44 UTC (rev 410) @@ -3,8 +3,8 @@ /* * #%L * Chorem :: webmotion - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% Property changes on: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesPerAccountReportAction.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesPerProjectReportAction.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesPerProjectReportAction.java 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesPerProjectReportAction.java 2014-04-09 14:29:44 UTC (rev 410) @@ -3,8 +3,8 @@ /* * #%L * Chorem :: webmotion - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% Property changes on: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesPerProjectReportAction.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesReportAction.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesReportAction.java 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesReportAction.java 2014-04-09 14:29:44 UTC (rev 410) @@ -3,8 +3,8 @@ /* * #%L * Chorem :: webmotion - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% Property changes on: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesReportAction.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesReportHelper.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesReportHelper.java 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesReportHelper.java 2014-04-09 14:29:44 UTC (rev 410) @@ -3,8 +3,8 @@ /* * #%L * Chorem :: webmotion - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% Property changes on: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesReportHelper.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SentQuotationsReportAction.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SentQuotationsReportAction.java 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SentQuotationsReportAction.java 2014-04-09 14:29:44 UTC (rev 410) @@ -3,8 +3,8 @@ /* * #%L * Chorem :: webmotion - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% Property changes on: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SentQuotationsReportAction.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/bean/financial/ExpenseAccountBean.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/bean/financial/ExpenseAccountBean.java (rev 0) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/bean/financial/ExpenseAccountBean.java 2014-04-09 14:29:44 UTC (rev 410) @@ -0,0 +1,89 @@ +package org.chorem.webmotion.bean.financial; + +/* + * #%L + * Chorem :: webmotion + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + +import java.io.Serializable; +import java.util.Set; + +/** + * @author ymartel <martel(a)codelutin.com> + */ +public class ExpenseAccountBean implements Serializable { + + protected String id; + protected String employeeName; + protected String employeeId; + protected int month; + protected int year; + protected Set<ExpenseAccountEntryBean> expenseAccountEntries; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getEmployeeName() { + return employeeName; + } + + public void setEmployeeName(String employeeName) { + this.employeeName = employeeName; + } + + public String getEmployeeId() { + return employeeId; + } + + public void setEmployeeId(String employeeId) { + this.employeeId = employeeId; + } + + public int getMonth() { + return month; + } + + public void setMonth(int month) { + this.month = month; + } + + public int getYear() { + return year; + } + + public void setYear(int year) { + this.year = year; + } + + public Set<ExpenseAccountEntryBean> getExpenseAccountEntries() { + return expenseAccountEntries; + } + + public void setExpenseAccountEntries(Set<ExpenseAccountEntryBean> expenseAccountEntries) { + this.expenseAccountEntries = expenseAccountEntries; + } + +} Property changes on: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/bean/financial/ExpenseAccountBean.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/bean/financial/ExpenseAccountEntryBean.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/bean/financial/ExpenseAccountEntryBean.java (rev 0) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/bean/financial/ExpenseAccountEntryBean.java 2014-04-09 14:29:44 UTC (rev 410) @@ -0,0 +1,123 @@ +package org.chorem.webmotion.bean.financial; + +/* + * #%L + * Chorem :: webmotion + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + +import java.io.Serializable; + +/** + * @author ymartel (martel(a)codelutin.com) + */ +public class ExpenseAccountEntryBean implements Serializable { + + protected String categoryName; + protected long emittedDate; + protected long paymentDate; + protected String description; + protected String justificationNumber; + protected Double amount; + protected Double VAT; + protected String projectName; + protected String projectId; + protected Double total; + + public String getCategoryName() { + return categoryName; + } + + public void setCategoryName(String categoryName) { + this.categoryName = categoryName; + } + + public long getEmittedDate() { + return emittedDate; + } + + public void setEmittedDate(long emittedDate) { + this.emittedDate = emittedDate; + } + + public long getPaymentDate() { + return paymentDate; + } + + public void setPaymentDate(long paymentDate) { + this.paymentDate = paymentDate; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public String getJustificationNumber() { + return justificationNumber; + } + + public void setJustificationNumber(String justificationNumber) { + this.justificationNumber = justificationNumber; + } + + public Double getAmount() { + return amount; + } + + public void setAmount(Double amount) { + this.amount = amount; + } + + public Double getVAT() { + return VAT; + } + + public void setVAT(Double VAT) { + this.VAT = VAT; + } + + public String getProjectName() { + return projectName; + } + + public void setProjectName(String projectName) { + this.projectName = projectName; + } + + public String getProjectId() { + return projectId; + } + + public void setProjectId(String projectId) { + this.projectId = projectId; + } + + public Double getTotal() { + return total; + } + + public void setTotal(Double total) { + this.total = total; + } +} Property changes on: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/bean/financial/ExpenseAccountEntryBean.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/filters/AuthenticationFilter.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/filters/AuthenticationFilter.java 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/filters/AuthenticationFilter.java 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ /* * #%L * Chorem webmotion - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 - 2012 CodeLutin * %% Property changes on: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/filters/AuthenticationFilter.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/filters/ChoremClientFilter.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/filters/ChoremClientFilter.java 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/filters/ChoremClientFilter.java 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ /* * #%L * Chorem webmotion - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 - 2012 CodeLutin * %% Property changes on: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/filters/ChoremClientFilter.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/filters/DecoratorFilter.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/filters/DecoratorFilter.java 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/filters/DecoratorFilter.java 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ /* * #%L * Chorem webmotion - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 - 2012 CodeLutin * %% Property changes on: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/filters/DecoratorFilter.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/injector/InjectorListener.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/injector/InjectorListener.java 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/injector/InjectorListener.java 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ /* * #%L * Chorem webmotion - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 - 2012 CodeLutin * %% Property changes on: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/injector/InjectorListener.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/render/RenderWikitty.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/render/RenderWikitty.java 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/render/RenderWikitty.java 2014-04-09 14:29:44 UTC (rev 410) @@ -3,8 +3,8 @@ /* * #%L * Chorem :: webmotion - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% Property changes on: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/render/RenderWikitty.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/render/RenderWikittyJson.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/render/RenderWikittyJson.java 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/render/RenderWikittyJson.java 2014-04-09 14:29:44 UTC (rev 410) @@ -3,8 +3,8 @@ /* * #%L * Chorem :: webmotion - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% Property changes on: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/render/RenderWikittyJson.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyDisplay.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyDisplay.java 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyDisplay.java 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ /* * #%L * Chorem webmotion - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 - 2012 CodeLutin * %% Property changes on: trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyDisplay.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyInput.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyInput.java 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyInput.java 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ /* * #%L * Chorem webmotion - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 - 2012 CodeLutin * %% Property changes on: trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyInput.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/chorem-webmotion/src/main/resources/i18n/chorem-webmotion_en_GB.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/chorem-webmotion/src/main/resources/i18n/chorem-webmotion_fr_FR.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/resources/log4j.properties =================================================================== --- trunk/chorem-webmotion/src/main/resources/log4j.properties 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/resources/log4j.properties 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ ### # #%L # Chorem webmotion -# $Id:$ -# $HeadURL:$ +# $Id$ +# $HeadURL$ # %% # Copyright (C) 2011 - 2012 CodeLutin # %% Property changes on: trunk/chorem-webmotion/src/main/resources/log4j.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/resources/mapping =================================================================== --- trunk/chorem-webmotion/src/main/resources/mapping 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/resources/mapping 2014-04-09 14:29:44 UTC (rev 410) @@ -14,6 +14,7 @@ * /sales/funnel/partial/* DecoratorFilter.decorate wmDecoratorNo=true * /crm/export DecoratorFilter.decorate wmDecoratorNo=true * /project/json/* DecoratorFilter.decorate wmDecoratorNo=true +* /financial/json/* DecoratorFilter.decorate wmDecoratorNo=true * /project/editProject.html DecoratorFilter.decorate wmDecoratorNo=true * /hr/employeeEdit/json/* DecoratorFilter.decorate wmDecoratorNo=true * /ascii/* DecoratorFilter.decorate wmDecoratorNo=true @@ -95,10 +96,17 @@ * /crm/export action:crm.ExportAction.exportContactBase GET /project/json/projects?page={page}&count={count} action:project.ProjectsAction.findAllProjects page=1,count=10 -GET /project/projects.html view:projects/projects.jsp -GET /project/editProject.html view:projects/editProject.html +GET /project/projects view:projects/projects.jsp +GET /project/editProject view:projects/editProject.html PUT /projects/{projectId}/ action:project.ProjectsAction.updateProject +#### Expense Accounts #### +GET /financial/json/expenseAccounts?year={year}&month={month}&page={page}&count={count} action:financial.ExpenseAccountAction.findAllExpenseAccounts page=1,count=20 +GET /financial/expenseAccounts view:financial/expenseAccounts.jsp +GET /financial/expenseAccounts/{expenseAccountId} action:financial.ExpenseAccountAction.findExpenseAccount +PUT /financial/expenseAccounts/{expenseAccountId} action:financial.ExpenseAccountAction.saveExpenseAccount + + # # Wikitty Rest API # Property changes on: trunk/chorem-webmotion/src/main/resources/mapping ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/admin/importExport.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/admin/importExport.jsp 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/admin/importExport.jsp 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ <%-- #%L Chorem :: webmotion - $Id:$ - $HeadURL:$ + $Id$ + $HeadURL$ %% Copyright (C) 2011 - 2014 CodeLutin %% Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/admin/importExport.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/bi/reportDefinition.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/bi/reportDefinition.jsp 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/bi/reportDefinition.jsp 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ <%-- #%L Chorem webmotion - $Id:$ - $HeadURL:$ + $Id$ + $HeadURL$ %% Copyright (C) 2011 - 2012 CodeLutin %% Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/bi/reportDefinition.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/contact.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/contact.jsp 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/contact.jsp 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ <%-- #%L Chorem webmotion - $Id:$ - $HeadURL:$ + $Id$ + $HeadURL$ %% Copyright (C) 2011 - 2012 CodeLutin %% Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/contact.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/crm/account.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/crm/account.jsp 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/crm/account.jsp 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ <%-- #%L Chorem webmotion - $Id:$ - $HeadURL:$ + $Id$ + $HeadURL$ %% Copyright (C) 2011 - 2012 CodeLutin %% Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/crm/account.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/crm/company.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/crm/company.jsp 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/crm/company.jsp 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ <%-- #%L Chorem :: webmotion - $Id:$ - $HeadURL:$ + $Id$ + $HeadURL$ %% Copyright (C) 2011 - 2014 CodeLutin %% Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/crm/company.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/crm/editQuotation.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/crm/editQuotation.jsp 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/crm/editQuotation.jsp 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ <%-- #%L Chorem webmotion - $Id:$ - $HeadURL:$ + $Id$ + $HeadURL$ %% Copyright (C) 2011 - 2012 CodeLutin %% Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/crm/editQuotation.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/crm/project.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/crm/project.jsp 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/crm/project.jsp 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ <%-- #%L Chorem :: webmotion - $Id:$ - $HeadURL:$ + $Id$ + $HeadURL$ %% Copyright (C) 2011 - 2014 CodeLutin %% Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/crm/project.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardAdc.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardAdc.jsp 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardAdc.jsp 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ <%-- #%L Chorem webmotion - $Id:$ - $HeadURL:$ + $Id$ + $HeadURL$ %% Copyright (C) 2011 - 2012 CodeLutin %% Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardAdc.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardAnnualProfit.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardAnnualProfit.jsp 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardAnnualProfit.jsp 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ <%-- #%L Chorem webmotion - $Id:$ - $HeadURL:$ + $Id$ + $HeadURL$ %% Copyright (C) 2011 - 2012 CodeLutin %% Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardAnnualProfit.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardBudget.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardBudget.jsp 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardBudget.jsp 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ <%-- #%L Chorem webmotion - $Id:$ - $HeadURL:$ + $Id$ + $HeadURL$ %% Copyright (C) 2011 - 2012 CodeLutin %% Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardBudget.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardEmployee.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardEmployee.jsp 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardEmployee.jsp 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ <%-- #%L Chorem webmotion - $Id:$ - $HeadURL:$ + $Id$ + $HeadURL$ %% Copyright (C) 2011 - 2012 CodeLutin %% Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardEmployee.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardInvoice.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardInvoice.jsp 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardInvoice.jsp 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ <%-- #%L Chorem webmotion - $Id:$ - $HeadURL:$ + $Id$ + $HeadURL$ %% Copyright (C) 2011 - 2012 CodeLutin %% Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardInvoice.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardMultiProject.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardMultiProject.jsp 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardMultiProject.jsp 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ <%-- #%L Chorem webmotion - $Id:$ - $HeadURL:$ + $Id$ + $HeadURL$ %% Copyright (C) 2011 - 2012 CodeLutin %% Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardMultiProject.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardProfitability.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardProfitability.jsp 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardProfitability.jsp 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ <%-- #%L Chorem webmotion - $Id:$ - $HeadURL:$ + $Id$ + $HeadURL$ %% Copyright (C) 2011 - 2012 CodeLutin %% Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardProfitability.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardProject.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardProject.jsp 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardProject.jsp 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ <%-- #%L Chorem webmotion - $Id:$ - $HeadURL:$ + $Id$ + $HeadURL$ %% Copyright (C) 2011 - 2012 CodeLutin %% Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardProject.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardQuotation.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardQuotation.jsp 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardQuotation.jsp 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ <%-- #%L Chorem webmotion - $Id:$ - $HeadURL:$ + $Id$ + $HeadURL$ %% Copyright (C) 2011 - 2012 CodeLutin %% Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardQuotation.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardRequestVacation.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardRequestVacation.jsp 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardRequestVacation.jsp 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ <%-- #%L Chorem webmotion - $Id:$ - $HeadURL:$ + $Id$ + $HeadURL$ %% Copyright (C) 2011 - 2012 CodeLutin %% Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardRequestVacation.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardSingleProject.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardSingleProject.jsp 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardSingleProject.jsp 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ <%-- #%L Chorem webmotion - $Id:$ - $HeadURL:$ + $Id$ + $HeadURL$ %% Copyright (C) 2011 - 2012 CodeLutin %% Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardSingleProject.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardSummary.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardSummary.jsp 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardSummary.jsp 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ <%-- #%L Chorem webmotion - $Id:$ - $HeadURL:$ + $Id$ + $HeadURL$ %% Copyright (C) 2011 - 2012 CodeLutin %% Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardSummary.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardVAT.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardVAT.jsp 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardVAT.jsp 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ <%-- #%L Chorem webmotion - $Id:$ - $HeadURL:$ + $Id$ + $HeadURL$ %% Copyright (C) 2011 - 2012 CodeLutin %% Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardVAT.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardVacation.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardVacation.jsp 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardVacation.jsp 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ <%-- #%L Chorem webmotion - $Id:$ - $HeadURL:$ + $Id$ + $HeadURL$ %% Copyright (C) 2011 - 2012 CodeLutin %% Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardVacation.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardVacationAsked.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardVacationAsked.jsp 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardVacationAsked.jsp 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ <%-- #%L Chorem webmotion - $Id:$ - $HeadURL:$ + $Id$ + $HeadURL$ %% Copyright (C) 2011 - 2012 CodeLutin %% Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardVacationAsked.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardVacationByEmployee.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardVacationByEmployee.jsp 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardVacationByEmployee.jsp 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ <%-- #%L Chorem webmotion - $Id:$ - $HeadURL:$ + $Id$ + $HeadURL$ %% Copyright (C) 2011 - 2012 CodeLutin %% Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardVacationByEmployee.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardWorkingProjectDaysByEmployee.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardWorkingProjectDaysByEmployee.jsp 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardWorkingProjectDaysByEmployee.jsp 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ <%-- #%L Chorem webmotion - $Id:$ - $HeadURL:$ + $Id$ + $HeadURL$ %% Copyright (C) 2011 - 2012 CodeLutin %% Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardWorkingProjectDaysByEmployee.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ <%-- #%L Chorem webmotion - $Id:$ - $HeadURL:$ + $Id$ + $HeadURL$ %% Copyright (C) 2011 - 2012 CodeLutin %% Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/edit.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/edit.jsp 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/edit.jsp 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ <%-- #%L Chorem webmotion - $Id:$ - $HeadURL:$ + $Id$ + $HeadURL$ %% Copyright (C) 2011 - 2012 CodeLutin %% Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/edit.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/editMulti.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/editMulti.jsp 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/editMulti.jsp 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ <%-- #%L Chorem webmotion - $Id:$ - $HeadURL:$ + $Id$ + $HeadURL$ %% Copyright (C) 2011 - 2012 CodeLutin %% Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/editMulti.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/editRelated.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/editRelated.jsp 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/editRelated.jsp 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ <%-- #%L Chorem webmotion - $Id:$ - $HeadURL:$ + $Id$ + $HeadURL$ %% Copyright (C) 2011 - 2012 CodeLutin %% Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/editRelated.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/editVacationRequest.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/editVacationRequest.jsp 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/editVacationRequest.jsp 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ <%-- #%L Chorem webmotion - $Id:$ - $HeadURL:$ + $Id$ + $HeadURL$ %% Copyright (C) 2011 - 2012 CodeLutin %% Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/editVacationRequest.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/employeeEdit.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/employeeEdit.jsp 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/employeeEdit.jsp 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ <%-- #%L Chorem webmotion - $Id:$ - $HeadURL:$ + $Id$ + $HeadURL$ %% Copyright (C) 2011 - 2012 CodeLutin %% Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/employeeEdit.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/expenseAccountView.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/expenseAccountView.jsp (rev 0) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/expenseAccountView.jsp 2014-04-09 14:29:44 UTC (rev 410) @@ -0,0 +1,70 @@ +<%-- + #%L + Chorem :: webmotion + $Id$ + $HeadURL$ + %% + Copyright (C) 2011 - 2014 CodeLutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% + --%> +<%@page contentType="text/html" pageEncoding="UTF-8"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> +<%@ taglib uri="/WEB-INF/wikitty.tld" prefix="w"%> + +<head> + <script data-require="angular-resource(a)1.2.0-rc.3" data-semver="1.2.0-rc.3" src="<c:url value='http://code.angularjs.org/1.2.0-rc.3/angular-resource.js'/>"></script> + <link data-require="bootstrap-css@*" data-semver="3.0.0" rel="stylesheet" href="<c:url value='http://netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap.min.css'/>" /> +</head> + +<div > + <dl> + <dd><a href="<c:url value="/wikitty/view/${expenseAccount.employeeId}"/>">${expenseAccount.employeeName}</a></dd> + <dd>Period : ${expenseAccount.month} / ${expenseAccount.year}</dd> + </dl> +</div> + +<div ng-app> + <table> + <tr> + <th>Justif. Nb</th> + <th>Emitted Date</th> + <th>Project</th> + <th>Description</th> + <th>Category</th> + <th>Amount</th> + <th>VAT</th> + <th>total</th> + <th>Payment Date</th> + </tr> + <c:forEach var="expenseEntry" items="${expenseAccount.expenseAccountEntries}"> + <tr> + <td>${expenseEntry.justificationNumber}</td> + <td>{{${expenseEntry.emittedDate}| date:'shortDate'}}</td> + <td><a href="<c:url value="/wikitty/view/${expenseEntry.projectId}"/>">${expenseEntry.projectName}</a></td> + <td>${expenseEntry.description}</td> + <td>${expenseEntry.categoryName}</td> + <td>{{${expenseEntry.amount}|number:2}}</td> + <td>{{${expenseEntry.VAT}|number:2}}</td> + <td>{{${expenseEntry.total}|number:2}}</td> + <td><span ng-if = "${expenseEntry.paymentDate} != 0"> {{${expenseEntry.paymentDate}|date:'shortDate'}}</span></td> + </tr> + </c:forEach> + </table> +</div> + +<div> + <a class="btn btn-success" href="<c:url value="/financial/expenseAccounts/new"/>"><i class="icon-list icon-white"></i> New one</a> +</div> Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/expenseAccountView.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/expenseAccounts.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/expenseAccounts.jsp (rev 0) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/expenseAccounts.jsp 2014-04-09 14:29:44 UTC (rev 410) @@ -0,0 +1,61 @@ +<%-- + #%L + Chorem :: webmotion + $Id$ + $HeadURL$ + %% + Copyright (C) 2011 - 2014 CodeLutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% + --%> +<%@page contentType="text/html" pageEncoding="UTF-8"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> +<%@ taglib uri="/WEB-INF/wikitty.tld" prefix="w"%> + +<head> + <script data-require="angular-resource(a)1.2.0-rc.3" data-semver="1.2.0-rc.3" src="<c:url value='http://code.angularjs.org/1.2.0-rc.3/angular-resource.js'/>"></script> + <script data-require="ng-table@*" data-semver="0.3.0" src="<c:url value='http://bazalt-cms.com/assets/ng-table/0.3.0/ng-table.js'/>"></script> + <link data-require="ng-table@*" data-semver="0.3.0" rel="stylesheet" href="<c:url value='http://bazalt-cms.com/assets/ng-table/0.3.0/ng-table.css'/>" /> + <link data-require="bootstrap-css@*" data-semver="3.0.0" rel="stylesheet" href="<c:url value='http://netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap.min.css'/>" /> + <script type="text/javascript" src="<c:url value='/js/expensePagination.js'/>"></script> +</head> + +<div ng-app="expenseAccountList" ng-controller="PageCtrl"> + + <div loading-container="tableParams.settings().$loading"> + <table ng-table="tableParams" show-filter="false" class="table"> + <tbody ng-repeat="expenseAccount in expenseAccounts"> + <tr id="tr{{expenseAccount.id}}" ng-class-odd="'odd'" ng-class-even="'even'"> + <td data-title="'Employee'"> + <a href="<c:url value="/wikitty/view/{{expenseAccount.employeeId}}"/>">{{expenseAccount.employeeName}}</a> + </td> + <td data-title="'Month'"> + {{expenseAccount.month}} + </td> + <td data-title="'Year'"> + {{expenseAccount.year}} + </td> + <td> + <a class="btn btn-success" href="<c:url value="/financial/expenseAccounts/{{expenseAccount.id}}"/>">See it</a> + </td> + </tr> + </tbody> + </table> + </div> +</div> + +<div> + <a class="btn btn-success" href="<c:url value="/financial/expenseAccounts/new"/>"><i class="icon-list icon-white"></i> New one</a> +</div> Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/expenseAccounts.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/hr.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/hr.jsp 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/hr.jsp 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ <%-- #%L Chorem webmotion - $Id:$ - $HeadURL:$ + $Id$ + $HeadURL$ %% Copyright (C) 2011 - 2012 CodeLutin %% Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/hr.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/index.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/index.jsp 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/index.jsp 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ <%-- #%L Chorem webmotion - $Id:$ - $HeadURL:$ + $Id$ + $HeadURL$ %% Copyright (C) 2011 - 2012 CodeLutin %% Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/index.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/login.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/login.jsp 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/login.jsp 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ <%-- #%L Chorem webmotion - $Id:$ - $HeadURL:$ + $Id$ + $HeadURL$ %% Copyright (C) 2011 - 2012 CodeLutin %% Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/login.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/projects/editProject.html =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/projects/editProject.html 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/projects/editProject.html 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ <!-- #%L Chorem :: webmotion - $Id:$ - $HeadURL:$ + $Id$ + $HeadURL$ %% Copyright (C) 2011 - 2014 CodeLutin %% Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/projects/editProject.html ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/projects/projects.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/projects/projects.jsp 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/projects/projects.jsp 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ <%-- #%L Chorem :: webmotion - $Id:$ - $HeadURL:$ + $Id$ + $HeadURL$ %% Copyright (C) 2011 - 2014 CodeLutin %% Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/projects/projects.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/report.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/report.jsp 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/report.jsp 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ <%-- #%L Chorem webmotion - $Id:$ - $HeadURL:$ + $Id$ + $HeadURL$ %% Copyright (C) 2011 - 2012 CodeLutin %% Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/report.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/acceptedQuotation.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/acceptedQuotation.jsp 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/acceptedQuotation.jsp 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ <%-- #%L Chorem webmotion - $Id:$ - $HeadURL:$ + $Id$ + $HeadURL$ %% Copyright (C) 2011 - 2012 CodeLutin %% Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/acceptedQuotation.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/accountSalesReport.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/accountSalesReport.jsp 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/accountSalesReport.jsp 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ <%-- #%L Chorem webmotion - $Id:$ - $HeadURL:$ + $Id$ + $HeadURL$ %% Copyright (C) 2011 - 2012 CodeLutin %% Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/accountSalesReport.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-cancel.html =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-cancel.html 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-cancel.html 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ <!-- #%L Chorem :: webmotion - $Id:$ - $HeadURL:$ + $Id$ + $HeadURL$ %% Copyright (C) 2011 - 2014 CodeLutin %% Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-cancel.html ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-draftToSent.html =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-draftToSent.html 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-draftToSent.html 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ <!-- #%L Chorem :: webmotion - $Id:$ - $HeadURL:$ + $Id$ + $HeadURL$ %% Copyright (C) 2011 - 2014 CodeLutin %% Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-draftToSent.html ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-leadToDraft.html =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-leadToDraft.html 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-leadToDraft.html 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ <!-- #%L Chorem :: webmotion - $Id:$ - $HeadURL:$ + $Id$ + $HeadURL$ %% Copyright (C) 2011 - 2014 CodeLutin %% Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-leadToDraft.html ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-sentToAccepted.html =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-sentToAccepted.html 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-sentToAccepted.html 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ <!-- #%L Chorem :: webmotion - $Id:$ - $HeadURL:$ + $Id$ + $HeadURL$ %% Copyright (C) 2011 - 2014 CodeLutin %% Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-sentToAccepted.html ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-sentToRejected.html =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-sentToRejected.html 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-sentToRejected.html 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ <!-- #%L Chorem :: webmotion - $Id:$ - $HeadURL:$ + $Id$ + $HeadURL$ %% Copyright (C) 2011 - 2014 CodeLutin %% Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-sentToRejected.html ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/menu.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/menu.jsp 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/menu.jsp 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ <%-- #%L Chorem :: webmotion - $Id:$ - $HeadURL:$ + $Id$ + $HeadURL$ %% Copyright (C) 2011 - 2014 CodeLutin %% Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/menu.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/projectSalesReport.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/projectSalesReport.jsp 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/projectSalesReport.jsp 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ <%-- #%L Chorem webmotion - $Id:$ - $HeadURL:$ + $Id$ + $HeadURL$ %% Copyright (C) 2011 - 2012 CodeLutin %% Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/projectSalesReport.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/sales.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/sales.jsp 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/sales.jsp 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ <%-- #%L Chorem webmotion - $Id:$ - $HeadURL:$ + $Id$ + $HeadURL$ %% Copyright (C) 2011 - 2012 CodeLutin %% Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/sales.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesFunnel.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesFunnel.jsp 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesFunnel.jsp 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ <%-- #%L Chorem webmotion - $Id:$ - $HeadURL:$ + $Id$ + $HeadURL$ %% Copyright (C) 2011 - 2012 CodeLutin %% Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesFunnel.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesPerAccountReport.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesPerAccountReport.jsp 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesPerAccountReport.jsp 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ <%-- #%L Chorem webmotion - $Id:$ - $HeadURL:$ + $Id$ + $HeadURL$ %% Copyright (C) 2011 - 2012 CodeLutin %% Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesPerAccountReport.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesPerProjectReport.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesPerProjectReport.jsp 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesPerProjectReport.jsp 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ <%-- #%L Chorem webmotion - $Id:$ - $HeadURL:$ + $Id$ + $HeadURL$ %% Copyright (C) 2011 - 2012 CodeLutin %% Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesPerProjectReport.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesReport.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesReport.jsp 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesReport.jsp 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ <%-- #%L Chorem webmotion - $Id:$ - $HeadURL:$ + $Id$ + $HeadURL$ %% Copyright (C) 2011 - 2012 CodeLutin %% Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesReport.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/sentQuotation.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/sentQuotation.jsp 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/sentQuotation.jsp 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ <%-- #%L Chorem webmotion - $Id:$ - $HeadURL:$ + $Id$ + $HeadURL$ %% Copyright (C) 2011 - 2012 CodeLutin %% Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/sentQuotation.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/search.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/search.jsp 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/search.jsp 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ <%-- #%L Chorem webmotion - $Id:$ - $HeadURL:$ + $Id$ + $HeadURL$ %% Copyright (C) 2011 - 2012 CodeLutin %% Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/search.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/simpleWikiFields.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/simpleWikiFields.jsp 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/simpleWikiFields.jsp 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ <%-- #%L Chorem webmotion - $Id:$ - $HeadURL:$ + $Id$ + $HeadURL$ %% Copyright (C) 2011 - 2012 CodeLutin %% Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/simpleWikiFields.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/vacationDiv.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/vacationDiv.jsp 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/vacationDiv.jsp 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ <%-- #%L Chorem webmotion - $Id:$ - $HeadURL:$ + $Id$ + $HeadURL$ %% Copyright (C) 2011 - 2012 CodeLutin %% Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/vacationDiv.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/view.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/view.jsp 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/view.jsp 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ <%-- #%L Chorem webmotion - $Id:$ - $HeadURL:$ + $Id$ + $HeadURL$ %% Copyright (C) 2011 - 2012 CodeLutin %% Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/view.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionCompany.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionCompany.jsp 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionCompany.jsp 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ <%-- #%L Chorem webmotion - $Id:$ - $HeadURL:$ + $Id$ + $HeadURL$ %% Copyright (C) 2011 - 2012 CodeLutin %% Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionCompany.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionEmployee.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionEmployee.jsp 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionEmployee.jsp 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ <%-- #%L Chorem webmotion - $Id:$ - $HeadURL:$ + $Id$ + $HeadURL$ %% Copyright (C) 2011 - 2012 CodeLutin %% Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionEmployee.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionFinancialTransaction.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionFinancialTransaction.jsp 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionFinancialTransaction.jsp 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ <%-- #%L Chorem webmotion - $Id:$ - $HeadURL:$ + $Id$ + $HeadURL$ %% Copyright (C) 2011 - 2013 CodeLutin %% Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionFinancialTransaction.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionPerson.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionPerson.jsp 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionPerson.jsp 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ <%-- #%L Chorem webmotion - $Id:$ - $HeadURL:$ + $Id$ + $HeadURL$ %% Copyright (C) 2011 - 2012 CodeLutin %% Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionPerson.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionProject.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionProject.jsp 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionProject.jsp 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ <%-- #%L Chorem webmotion - $Id:$ - $HeadURL:$ + $Id$ + $HeadURL$ %% Copyright (C) 2011 - 2012 CodeLutin %% Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionProject.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionQuotation.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionQuotation.jsp 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionQuotation.jsp 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ <%-- #%L Chorem webmotion - $Id:$ - $HeadURL:$ + $Id$ + $HeadURL$ %% Copyright (C) 2011 - 2012 CodeLutin %% Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionQuotation.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionTask.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionTask.jsp 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionTask.jsp 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ <%-- #%L Chorem webmotion - $Id:$ - $HeadURL:$ + $Id$ + $HeadURL$ %% Copyright (C) 2011 - 2012 CodeLutin %% Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionTask.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/nuiton-js.properties =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/nuiton-js.properties 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/nuiton-js.properties 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ ### # #%L # Chorem :: webmotion -# $Id:$ -# $HeadURL:$ +# $Id$ +# $HeadURL$ # %% # Copyright (C) 2011 - 2014 CodeLutin # %% Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/nuiton-js.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/web.xml 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/web.xml 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ <!-- #%L Chorem webmotion - $Id:$ - $HeadURL:$ + $Id$ + $HeadURL$ %% Copyright (C) 2011 - 2012 CodeLutin, Chatellier Eric %% Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/web.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/wikitty.tld ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/wro.xml =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/wro.xml 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/wro.xml 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ <!-- #%L Chorem :: webmotion - $Id:$ - $HeadURL:$ + $Id$ + $HeadURL$ %% Copyright (C) 2011 - 2014 CodeLutin %% Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/wro.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/webapp/css/chorem-bi.css =================================================================== --- trunk/chorem-webmotion/src/main/webapp/css/chorem-bi.css 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/webapp/css/chorem-bi.css 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ /* * #%L * Chorem :: webmotion - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% Property changes on: trunk/chorem-webmotion/src/main/webapp/css/chorem-bi.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/webapp/css/chorem-crm.css =================================================================== --- trunk/chorem-webmotion/src/main/webapp/css/chorem-crm.css 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/webapp/css/chorem-crm.css 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ /* * #%L * Chorem :: webmotion - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% Property changes on: trunk/chorem-webmotion/src/main/webapp/css/chorem-crm.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/webapp/css/chorem-sales.css =================================================================== --- trunk/chorem-webmotion/src/main/webapp/css/chorem-sales.css 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/webapp/css/chorem-sales.css 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ /* * #%L * Chorem :: webmotion - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% Property changes on: trunk/chorem-webmotion/src/main/webapp/css/chorem-sales.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/chorem-webmotion/src/main/webapp/css/chorem.less ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/webapp/css/employeeEdit.css =================================================================== --- trunk/chorem-webmotion/src/main/webapp/css/employeeEdit.css 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/webapp/css/employeeEdit.css 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ /* * #%L * Chorem :: webmotion - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% Property changes on: trunk/chorem-webmotion/src/main/webapp/css/employeeEdit.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/webapp/css/jquery-ui-timepicker-addon.css =================================================================== --- trunk/chorem-webmotion/src/main/webapp/css/jquery-ui-timepicker-addon.css 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/webapp/css/jquery-ui-timepicker-addon.css 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ /* * #%L * Chorem webmotion - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 - 2012 CodeLutin * %% Property changes on: trunk/chorem-webmotion/src/main/webapp/css/jquery-ui-timepicker-addon.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/webapp/css/jquery.fn.gantt.css =================================================================== --- trunk/chorem-webmotion/src/main/webapp/css/jquery.fn.gantt.css 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/webapp/css/jquery.fn.gantt.css 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ /* * #%L * Chorem :: webmotion - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% Property changes on: trunk/chorem-webmotion/src/main/webapp/css/jquery.fn.gantt.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/webapp/css/ng-grid.min.css =================================================================== --- trunk/chorem-webmotion/src/main/webapp/css/ng-grid.min.css 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/webapp/css/ng-grid.min.css 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ /* * #%L * Chorem :: webmotion - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% Property changes on: trunk/chorem-webmotion/src/main/webapp/css/ng-grid.min.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/chorem-webmotion/src/main/webapp/css/select2/select2-spinner.gif ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/chorem-webmotion/src/main/webapp/css/select2/select2.css =================================================================== --- trunk/chorem-webmotion/src/main/webapp/css/select2/select2.css 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/webapp/css/select2/select2.css 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ /* * #%L * Chorem :: webmotion - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% Property changes on: trunk/chorem-webmotion/src/main/webapp/css/select2/select2.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/chorem-webmotion/src/main/webapp/css/select2/select2.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/chorem-webmotion/src/main/webapp/css/select2/select2x2.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/chorem-webmotion/src/main/webapp/css/vacationRequest.css =================================================================== --- trunk/chorem-webmotion/src/main/webapp/css/vacationRequest.css 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/webapp/css/vacationRequest.css 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ /* * #%L * Chorem webmotion - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 - 2012 CodeLutin * %% Property changes on: trunk/chorem-webmotion/src/main/webapp/css/vacationRequest.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/chorem-webmotion/src/main/webapp/img/ajax-loader.gif ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/chorem-webmotion/src/main/webapp/img/glyphicons-halflings-white.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/chorem-webmotion/src/main/webapp/img/glyphicons-halflings.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/chorem-webmotion/src/main/webapp/img/jquery.fn.gantt/grid.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/chorem-webmotion/src/main/webapp/img/jquery.fn.gantt/icon_sprite.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/chorem-webmotion/src/main/webapp/img/jquery.fn.gantt/loader_bg.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/chorem-webmotion/src/main/webapp/img/jquery.fn.gantt/slider_handle.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/chorem-webmotion/src/main/webapp/js/chorem.js =================================================================== --- trunk/chorem-webmotion/src/main/webapp/js/chorem.js 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/webapp/js/chorem.js 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ /* * #%L * Chorem webmotion - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 - 2012 CodeLutin * %% Property changes on: trunk/chorem-webmotion/src/main/webapp/js/chorem.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/webapp/js/dashboardAdc.js =================================================================== --- trunk/chorem-webmotion/src/main/webapp/js/dashboardAdc.js 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/webapp/js/dashboardAdc.js 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ /* * #%L * Chorem :: webmotion - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% Property changes on: trunk/chorem-webmotion/src/main/webapp/js/dashboardAdc.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/webapp/js/employeeEdit.js =================================================================== --- trunk/chorem-webmotion/src/main/webapp/js/employeeEdit.js 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/webapp/js/employeeEdit.js 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ /* * #%L * Chorem :: webmotion - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% Property changes on: trunk/chorem-webmotion/src/main/webapp/js/employeeEdit.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/chorem-webmotion/src/main/webapp/js/expensePagination.js =================================================================== --- trunk/chorem-webmotion/src/main/webapp/js/expensePagination.js (rev 0) +++ trunk/chorem-webmotion/src/main/webapp/js/expensePagination.js 2014-04-09 14:29:44 UTC (rev 410) @@ -0,0 +1,70 @@ +/* + * #%L + * Chorem :: webmotion + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +var app = angular.module('expenseAccountList', ['ngTable', 'ngResource']); + +app.controller('PageCtrl', + function($scope, $timeout, $resource, ngTableParams) { + + var Api = $resource('json/expenseAccounts'); + + $scope.tableParams = new ngTableParams({ + page: 1, // show first page + count: 20, + year: 2014, + month: 03 + }, { + total: 0, // length of data + getData: function($defer, params) { + + // ajax request to api + url = params.url(); + Api.get(url, function(data) { + $timeout(function() { + // update table params + params.total(data.total); + console.log(data); + // set new data + $scope.expenseAccounts = data.elements; + $defer.resolve(data); + }, 500); + }); + } + }); + +}); + +angular.module('expenseAccountList') +.directive('loadingContainer', function () { + return { + restrict: 'A', + scope: false, + link: function(scope, element, attrs) { + var loadingLayer = angular.element('<div class="loading"></div>'); + element.append(loadingLayer); + element.addClass('loading-container'); + scope.$watch(attrs.loadingContainer, function(value) { + loadingLayer.toggleClass('ng-hide', !value); + }); + } + }; +}); \ No newline at end of file Property changes on: trunk/chorem-webmotion/src/main/webapp/js/expensePagination.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/chorem-webmotion/src/main/webapp/js/jquery-ui-timepicker-addon.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/chorem-webmotion/src/main/webapp/js/jquery-ui-timepicker-fr.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/webapp/js/jquery.fn.gantt.js =================================================================== --- trunk/chorem-webmotion/src/main/webapp/js/jquery.fn.gantt.js 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/webapp/js/jquery.fn.gantt.js 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ /* * #%L * Chorem :: webmotion - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% Property changes on: trunk/chorem-webmotion/src/main/webapp/js/jquery.fn.gantt.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/chorem-webmotion/src/main/webapp/js/jquery.maskedinput-1.3.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/webapp/js/js-hypercube.min.js =================================================================== --- trunk/chorem-webmotion/src/main/webapp/js/js-hypercube.min.js 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/webapp/js/js-hypercube.min.js 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ /* * #%L * Chorem :: webmotion - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% Property changes on: trunk/chorem-webmotion/src/main/webapp/js/js-hypercube.min.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/webapp/js/less-1.3.3.js =================================================================== --- trunk/chorem-webmotion/src/main/webapp/js/less-1.3.3.js 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/webapp/js/less-1.3.3.js 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ /* * #%L * Chorem :: webmotion - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% Property changes on: trunk/chorem-webmotion/src/main/webapp/js/less-1.3.3.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/webapp/js/ng-grid-2.0.7.debug.js =================================================================== --- trunk/chorem-webmotion/src/main/webapp/js/ng-grid-2.0.7.debug.js 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/webapp/js/ng-grid-2.0.7.debug.js 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ /* * #%L * Chorem :: webmotion - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% Property changes on: trunk/chorem-webmotion/src/main/webapp/js/ng-grid-2.0.7.debug.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/webapp/js/ng-grid-2.0.7.min.js =================================================================== --- trunk/chorem-webmotion/src/main/webapp/js/ng-grid-2.0.7.min.js 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/webapp/js/ng-grid-2.0.7.min.js 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ /* * #%L * Chorem :: webmotion - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% Property changes on: trunk/chorem-webmotion/src/main/webapp/js/ng-grid-2.0.7.min.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/webapp/js/ng-select2.js =================================================================== --- trunk/chorem-webmotion/src/main/webapp/js/ng-select2.js 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/webapp/js/ng-select2.js 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ /* * #%L * Chorem :: webmotion - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% Property changes on: trunk/chorem-webmotion/src/main/webapp/js/ng-select2.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/webapp/js/ng-wikitty.js =================================================================== --- trunk/chorem-webmotion/src/main/webapp/js/ng-wikitty.js 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/webapp/js/ng-wikitty.js 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ /* * #%L * Chorem :: webmotion - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% Property changes on: trunk/chorem-webmotion/src/main/webapp/js/ng-wikitty.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/webapp/js/projectPagination.js =================================================================== --- trunk/chorem-webmotion/src/main/webapp/js/projectPagination.js 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/webapp/js/projectPagination.js 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ /* * #%L * Chorem :: webmotion - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% Property changes on: trunk/chorem-webmotion/src/main/webapp/js/projectPagination.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/webapp/js/salesFunnel.js =================================================================== --- trunk/chorem-webmotion/src/main/webapp/js/salesFunnel.js 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/webapp/js/salesFunnel.js 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ /* * #%L * Chorem :: webmotion - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% Property changes on: trunk/chorem-webmotion/src/main/webapp/js/salesFunnel.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/chorem-webmotion/src/main/webapp/js/select2.min.js =================================================================== --- trunk/chorem-webmotion/src/main/webapp/js/select2.min.js 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/chorem-webmotion/src/main/webapp/js/select2.min.js 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ /* * #%L * Chorem :: webmotion - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% Property changes on: trunk/chorem-webmotion/src/main/webapp/js/select2.min.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/pom.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/src/site/resources/images/logos/argouml-logo.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/images/logos/jrst-logo.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/images/logos/restructuredtext-logo.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/src/site/rst/calculations.rst =================================================================== --- trunk/src/site/rst/calculations.rst 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/src/site/rst/calculations.rst 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ .. - .. * #%L .. * Chorem -.. * $Id:$ -.. * $HeadURL:$ +.. * $Id$ +.. * $HeadURL$ .. * %% .. * Copyright (C) 2011 - 2014 CodeLutin .. * %% Property changes on: trunk/src/site/rst/calculations.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/src/site/rst/chorem-cdc.rst =================================================================== --- trunk/src/site/rst/chorem-cdc.rst 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/src/site/rst/chorem-cdc.rst 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ .. - .. * #%L .. * chorem -.. * $Id:$ -.. * $HeadURL:$ +.. * $Id$ +.. * $HeadURL$ .. * %% .. * Copyright (C) 2011 - 2012 CodeLutin .. * %% Property changes on: trunk/src/site/rst/chorem-cdc.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/src/site/rst/doc-devel.rst =================================================================== --- trunk/src/site/rst/doc-devel.rst 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/src/site/rst/doc-devel.rst 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ .. - .. * #%L .. * chorem -.. * $Id:$ -.. * $HeadURL:$ +.. * $Id$ +.. * $HeadURL$ .. * %% .. * Copyright (C) 2011 - 2012 CodeLutin .. * %% Property changes on: trunk/src/site/rst/doc-devel.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/src/site/rst/index.rst =================================================================== --- trunk/src/site/rst/index.rst 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/src/site/rst/index.rst 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ .. - .. * #%L .. * chorem -.. * $Id:$ -.. * $HeadURL:$ +.. * $Id$ +.. * $HeadURL$ .. * %% .. * Copyright (C) 2011 - 2012 CodeLutin .. * %% Property changes on: trunk/src/site/rst/index.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/src/site/rst/requisite.rst =================================================================== --- trunk/src/site/rst/requisite.rst 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/src/site/rst/requisite.rst 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ .. - .. * #%L .. * chorem -.. * $Id:$ -.. * $HeadURL:$ +.. * $Id$ +.. * $HeadURL$ .. * %% .. * Copyright (C) 2011 - 2012 CodeLutin .. * %% Property changes on: trunk/src/site/rst/requisite.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2014-03-13 15:19:41 UTC (rev 409) +++ trunk/src/site/site_fr.xml 2014-04-09 14:29:44 UTC (rev 410) @@ -1,8 +1,8 @@ <!-- #%L chorem - $Id:$ - $HeadURL:$ + $Id$ + $HeadURL$ %% Copyright (C) 2011 - 2012 CodeLutin %% Property changes on: trunk/src/site/site_fr.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0

Build failed in Jenkins: chorem-nightly » Chorem :: entities #2
by admin+ci-chorem.org＠codelutin.com 13 Mar '14

13 Mar '14

1 4

r409 - in trunk: . chorem-entities chorem-webmotion chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales
by ymartel＠users.chorem.org 13 Mar '14

13 Mar '14

Author: ymartel Date: 2014-03-13 16:19:41 +0100 (Thu, 13 Mar 2014) New Revision: 409 Url: http://forge.chorem.org/projects/chorem/repository/revisions/409 Log: review dependencies Modified: trunk/chorem-entities/pom.xml trunk/chorem-webmotion/pom.xml trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesReportAction.java trunk/pom.xml Modified: trunk/chorem-entities/pom.xml =================================================================== --- trunk/chorem-entities/pom.xml 2014-03-12 17:19:26 UTC (rev 408) +++ trunk/chorem-entities/pom.xml 2014-03-13 15:19:41 UTC (rev 409) @@ -62,6 +62,12 @@ </dependency> <dependency> + <groupId>org.parboiled</groupId> + <artifactId>parboiled-core</artifactId> + <version>1.1.6</version> + </dependency> + + <dependency> <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> </dependency> Modified: trunk/chorem-webmotion/pom.xml =================================================================== --- trunk/chorem-webmotion/pom.xml 2014-03-12 17:19:26 UTC (rev 408) +++ trunk/chorem-webmotion/pom.xml 2014-03-13 15:19:41 UTC (rev 409) @@ -43,6 +43,11 @@ </dependency> <dependency> + <groupId>com.google.code.gson</groupId> + <artifactId>gson</artifactId> + </dependency> + + <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> </dependency> Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesReportAction.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesReportAction.java 2014-03-12 17:19:26 UTC (rev 408) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesReportAction.java 2014-03-13 15:19:41 UTC (rev 409) @@ -23,7 +23,12 @@ * #L% */ -import org.apache.commons.lang.time.DateUtils; +import java.util.Date; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + +import org.apache.commons.lang3.time.DateUtils; import org.chorem.ChoremClient; import org.chorem.entities.Accepted; import org.debux.webmotion.server.WebMotionController; @@ -32,13 +37,7 @@ import org.nuiton.wikitty.WikittyClient; import org.nuiton.wikitty.query.WikittyQuery; import org.nuiton.wikitty.query.WikittyQueryMaker; -import org.nuiton.wikitty.query.conditions.Aggregate; -import java.util.Date; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; - /** * @author jcouteau <couteau(a)codelutin.com> */ Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-03-12 17:19:26 UTC (rev 408) +++ trunk/pom.xml 2014-03-13 15:19:41 UTC (rev 409) @@ -106,6 +106,8 @@ <nuitonjsJqplot.version>1.0.4r1121-1</nuitonjsJqplot.version> <nuitonjsBootstrap.version>2.3.2-1</nuitonjsBootstrap.version> + <gsonVersion>2.2.4</gsonVersion> +  <license.licenseName>agpl_v3</license.licenseName> @@ -286,6 +288,12 @@ </dependency> --> <dependency> + <groupId>com.google.code.gson</groupId> + <artifactId>gson</artifactId> + <version>${gsonVersion}</version> + </dependency> + + <dependency> <groupId>org.debux.webmotion</groupId> <artifactId>webmotion</artifactId> <version>${webmotionVersion}</version>

1 0

r408 - in trunk: . chorem-entities/src/main/java/org/chorem chorem-entities/src/main/java/org/chorem/project chorem-webmotion/src/main/java/org/chorem/webmotion/actions chorem-webmotion/src/main/java/org/wikitty/web/jsptag
by ymartel＠users.chorem.org 12 Mar '14

12 Mar '14

Author: ymartel Date: 2014-03-12 18:19:26 +0100 (Wed, 12 Mar 2014) New Revision: 408 Url: http://forge.chorem.org/projects/chorem/repository/revisions/408 Log: clean some code Modified: trunk/chorem-entities/src/main/java/org/chorem/ChoremClient.java trunk/chorem-entities/src/main/java/org/chorem/ChoremMain.java trunk/chorem-entities/src/main/java/org/chorem/project/Calculation.java trunk/chorem-entities/src/main/java/org/chorem/project/QuotationCalculation.java trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/HrAction.java trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyInput.java trunk/pom.xml Modified: trunk/chorem-entities/src/main/java/org/chorem/ChoremClient.java =================================================================== --- trunk/chorem-entities/src/main/java/org/chorem/ChoremClient.java 2014-02-19 16:38:14 UTC (rev 407) +++ trunk/chorem-entities/src/main/java/org/chorem/ChoremClient.java 2014-03-12 17:19:26 UTC (rev 408) @@ -22,6 +22,12 @@ */ package org.chorem; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Locale; +import java.util.Map; + import org.chorem.entities.Attachment; import org.chorem.entities.ChoremUser; import org.chorem.entities.Company; @@ -51,12 +57,6 @@ import org.nuiton.wikitty.query.WikittyQueryResult; import org.parboiled.common.StringUtils; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Locale; -import java.util.Map; - /** * Proxy pour l'application. Certaines methodes specifiques pour l'application * peuvent y etre ajoutees (ex: des find particulier) @@ -447,7 +447,7 @@ double dailyHoursWorked = 0; - if(companyW.hasExtension(CompanyHR.EXT_COMPANYHR) && + if(companyW != null && companyW.hasExtension(CompanyHR.EXT_COMPANYHR) && companyW.getFieldAsDouble(CompanyHR.EXT_COMPANYHR,CompanyHR.FIELD_COMPANYHR_DAILYHOURSWORKED) != 0) { if(w.hasExtension(EmployeeHR.EXT_EMPLOYEEHR) && w.getFieldAsDouble(EmployeeHR.EXT_EMPLOYEEHR, EmployeeHR.FIELD_EMPLOYEEHR_PARTIALTIME) != 0) { dailyHoursWorked = companyW.getFieldAsDouble(CompanyHR.EXT_COMPANYHR, CompanyHR.FIELD_COMPANYHR_DAILYHOURSWORKED) * Modified: trunk/chorem-entities/src/main/java/org/chorem/ChoremMain.java =================================================================== --- trunk/chorem-entities/src/main/java/org/chorem/ChoremMain.java 2014-02-19 16:38:14 UTC (rev 407) +++ trunk/chorem-entities/src/main/java/org/chorem/ChoremMain.java 2014-03-12 17:19:26 UTC (rev 408) @@ -22,12 +22,11 @@ */ package org.chorem; +import java.util.Arrays; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.config.ApplicationConfig; -import java.util.Arrays; - /** * * @author poussin @@ -49,7 +48,8 @@ // args = "--reindex".split(" "); System.out.println(String.format("Launching ChoremMain ... (args: %s)", Arrays.toString(args))); // getConfig do all: parse and doAllAction - ApplicationConfig config = ChoremConfig.getConfig(null, args); + //XXX ymartel 2014/03/12 : not used. +// ApplicationConfig config = ChoremConfig.getConfig(null, args); System.exit(0); } Modified: trunk/chorem-entities/src/main/java/org/chorem/project/Calculation.java =================================================================== --- trunk/chorem-entities/src/main/java/org/chorem/project/Calculation.java 2014-02-19 16:38:14 UTC (rev 407) +++ trunk/chorem-entities/src/main/java/org/chorem/project/Calculation.java 2014-03-12 17:19:26 UTC (rev 408) @@ -119,17 +119,20 @@ */ public Map<Employee, Double> getTimePercentages() { Map<Employee, Double> times = getTimes(); - Map<Employee, Double> timePercentages = new HashMap<Employee, Double>(); + Map<Employee, Double> timePercentages = new HashMap<Employee, Double>(times.size()); double sum = 0; - Set<Employee> keySet = times.keySet(); - for (Employee key : keySet) { - sum+= times.get(key); + Set<Employee> employees = times.keySet(); + for (Employee employee : employees) { + sum+= times.get(employee); } - for (Employee key : keySet) { - timePercentages.put(key, (times.get(key)/sum)*100); + // calculate percentage + for (Map.Entry<Employee, Double> employeeTime : times.entrySet()) { + Employee employee = employeeTime.getKey(); + Double time = employeeTime.getValue(); + timePercentages.put(employee, (time /sum)*100); + } - return timePercentages; } /** @@ -163,11 +166,12 @@ } double realReturn = 0; Set<Employee> keySet = times.keySet(); - for(Employee key : keySet) { + for (Map.Entry<Employee, Double> employeeTime : times.entrySet()) { + Employee key = employeeTime.getKey(); double srp = client.getDailyReturn(key); double hoursPerDay = client.getDailyHoursWorked(key); - realReturn += srp* ( times.get(key) / hoursPerDay ) ; + realReturn += srp* ( employeeTime.getValue() / hoursPerDay ) ; } realReturn = realReturn/getRealDays(); Modified: trunk/chorem-entities/src/main/java/org/chorem/project/QuotationCalculation.java =================================================================== --- trunk/chorem-entities/src/main/java/org/chorem/project/QuotationCalculation.java 2014-02-19 16:38:14 UTC (rev 407) +++ trunk/chorem-entities/src/main/java/org/chorem/project/QuotationCalculation.java 2014-03-12 17:19:26 UTC (rev 408) @@ -69,16 +69,15 @@ for(Task t : tasks) { Map<Employee, Double> taskPercentages = new TaskCalculation(t, client).getPercentages(); - for(Employee emp : taskPercentages.keySet()) { + for (Map.Entry<Employee, Double> employeeTime : taskPercentages.entrySet()) { double rate = (t.getEstimatedDays()/totalDays); - if(percentages.containsKey(emp)) { - //We temporaly put the sum in the map. - percentages.put(emp, percentages.get(emp) + taskPercentages.get(emp)*rate); + Employee emp = employeeTime.getKey(); + Double employeePercentage = percentages.get(emp); + if (employeePercentage == null) { + // the value was not found : init to 0 + employeePercentage = 0d; } - else { - percentages.put(emp, taskPercentages.get(emp)*rate); - } - + percentages.put(emp, employeePercentage + employeeTime.getValue() * rate); } } Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/HrAction.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/HrAction.java 2014-02-19 16:38:14 UTC (rev 407) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/HrAction.java 2014-03-12 17:19:26 UTC (rev 408) @@ -27,12 +27,15 @@ import java.util.Arrays; import java.util.HashMap; import java.util.List; -import org.chorem.entities.*; import java.util.Map; + import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.ChoremClient; +import org.chorem.entities.EmployeeHR; +import org.chorem.entities.Vacation; +import org.chorem.entities.VacationRequest; import org.debux.webmotion.server.call.Call; import org.debux.webmotion.server.render.Render; import org.nuiton.wikitty.WikittyUtil; @@ -51,7 +54,6 @@ */ static private Log log = LogFactory.getLog(HrAction.class); private Map<String, Object> params = new HashMap<String, Object>(); - private String dateDuJour = ""; // mettre isAnswer à true si on arrive en tant qu'administrateur pour saisir une réponse private boolean isAnswer = true; @@ -95,6 +97,14 @@ } // ajout des id Vacation liés à la VacationRequest + for (Map.Entry<String, List<Wikitty>> relatedEntry : wRelated.entrySet()) { + List<Wikitty> relatedWikitties = relatedEntry.getValue(); + int size = relatedWikitties.size(); + for (int ii = 0; ii < size; ii++) { + String wid = relatedWikitties.get(ii).getWikittyId(); + ids += separator + wid; + } + } for (String ws : wRelated.keySet()) { int size = wRelated.get(ws).size(); for (int ii = 0; ii < size; ii++) { @@ -120,7 +130,7 @@ String typeLeave = ""; Wikitty wEmployeeReq = null; - this.dateDuJour = WikittyUtil.toString((new java.util.Date())); + String dateDuJour = WikittyUtil.toString((new java.util.Date())); this.params = call.getExtractParameters(); String keyParams = ""; @@ -147,7 +157,7 @@ if (!this.isAnswer) { // on enregistre la date de demande updateVacationRequestField(w, VacationRequest.EXT_VACATIONREQUEST, - VacationRequest.FIELD_VACATIONREQUEST_DATEREQUEST, this.dateDuJour); + VacationRequest.FIELD_VACATIONREQUEST_DATEREQUEST, dateDuJour); // pour chaque période (Vacation) on enregistre le champ vacationRequest pour lier la période à la demande updateVacationRequestField(w, Vacation.EXT_VACATION, Vacation.FIELD_VACATION_VACATIONREQUEST, idVR); @@ -155,7 +165,7 @@ } else { // on enregistre la date de réponse updateVacationRequestField(w, VacationRequest.EXT_VACATIONREQUEST, - VacationRequest.FIELD_VACATIONREQUEST_DATEANSWER, this.dateDuJour); + VacationRequest.FIELD_VACATIONREQUEST_DATEANSWER, dateDuJour); // si l'ancien status de la demande est différent de "ACCEPTEE" ou "FERMETURE ANNUELLE" // si le nouveau status (réponse) est "ACCEPTEE" : pour chaque période demandée on met à jour les soldes de l'Employé Modified: trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyInput.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyInput.java 2014-02-19 16:38:14 UTC (rev 407) +++ trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyInput.java 2014-03-12 17:19:26 UTC (rev 408) @@ -23,31 +23,31 @@ package org.wikitty.web.jsptag; +import java.io.IOException; +import java.math.BigDecimal; +import java.text.NumberFormat; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import javax.servlet.ServletContext; +import javax.servlet.jsp.JspException; +import javax.servlet.jsp.JspWriter; +import javax.servlet.jsp.PageContext; +import javax.servlet.jsp.tagext.DynamicAttributes; +import javax.servlet.jsp.tagext.SimpleTagSupport; + import org.apache.commons.lang3.StringEscapeUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.time.DateFormatUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.wikitty.WikittyException; import org.nuiton.wikitty.WikittyUtil; import org.nuiton.wikitty.entities.FieldType; import org.nuiton.wikitty.entities.Wikitty; import org.nuiton.wikitty.entities.WikittyExtension; -import javax.servlet.ServletContext; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.JspWriter; -import javax.servlet.jsp.PageContext; -import javax.servlet.jsp.tagext.DynamicAttributes; -import javax.servlet.jsp.tagext.SimpleTagSupport; -import java.io.IOException; -import java.math.BigDecimal; -import java.text.NumberFormat; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - /** * * @author poussin @@ -173,11 +173,11 @@ } protected String getDynamicAttribute() { - String result = ""; + StringBuilder result = new StringBuilder(); for (Map.Entry<String, Object> e : dynamicAttribute.entrySet()) { - result += " " + e.getKey() + "=\"" + e.getValue() + "\""; + result.append(" " + e.getKey() + "=\"" + e.getValue() + "\""); } - return result; + return result.toString(); } @@ -392,18 +392,19 @@ } String sep = ""; - String prePopulate = "["; + StringBuilder builder = new StringBuilder("["); if (values != null) { for (Wikitty w :values) { if (w != null) { - prePopulate += String.format("%s{id:'%s', label:'%s'}", sep, + builder.append(String.format("%s{id:'%s', label:'%s'}", sep, StringEscapeUtils.escapeEcmaScript(w.getWikittyId()), - StringEscapeUtils.escapeEcmaScript(w.toString())); + StringEscapeUtils.escapeEcmaScript(w.toString()))); sep = ","; } } } - prePopulate += "]"; + builder.append("]"); + String prePopulate = builder.toString(); /*{ <script type="text/javascript"> $(document).ready(function () { Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-02-19 16:38:14 UTC (rev 407) +++ trunk/pom.xml 2014-03-12 17:19:26 UTC (rev 408) @@ -115,6 +115,8 @@  <javaVersion>1.7</javaVersion> + <signatureArtifactId>java17</signatureArtifactId> + <signatureVersion>1.0</signatureVersion> </properties>

1 0

r407 - in trunk: . chorem-entities/src/main/java/com/inamik/utils chorem-entities/src/main/java/org/chorem chorem-entities/src/main/java/org/chorem/entities chorem-entities/src/main/java/org/chorem/project chorem-entities/src/site/rst chorem-entities/src/test/java/org/chorem chorem-webmotion/src/main/java/org/chorem/webmotion chorem-webmotion/src/main/java/org/chorem/webmotion/actions chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm chorem-webmotion/src/main/java/org/chorem/w
by ymartel＠users.chorem.org 19 Feb '14

19 Feb '14

Author: ymartel Date: 2014-02-19 17:38:14 +0100 (Wed, 19 Feb 2014) New Revision: 407 Url: http://chorem.org/projects/chorem/repository/revisions/407 Log: update file headers Modified: trunk/LICENSE.txt trunk/chorem-entities/src/main/java/com/inamik/utils/AbstractTableFormatter.java trunk/chorem-entities/src/main/java/com/inamik/utils/SimpleTableFormatter.java trunk/chorem-entities/src/main/java/com/inamik/utils/TableFormatter.java trunk/chorem-entities/src/main/java/org/chorem/ChoremUtil.java trunk/chorem-entities/src/main/java/org/chorem/entities/Quotation18Migration.java trunk/chorem-entities/src/main/java/org/chorem/entities/QuotationMigration.java trunk/chorem-entities/src/main/java/org/chorem/entities/VacationMigration.java trunk/chorem-entities/src/main/java/org/chorem/project/AdcCalculation.java trunk/chorem-entities/src/main/java/org/chorem/project/Calculation.java trunk/chorem-entities/src/main/java/org/chorem/project/QuotationCalculation.java trunk/chorem-entities/src/main/java/org/chorem/project/TaskCalculation.java trunk/chorem-entities/src/main/java/org/chorem/project/TotalQuotationCalculation.java trunk/chorem-entities/src/site/rst/gepeto.rst trunk/chorem-entities/src/test/java/org/chorem/ChoremUtilTest.java trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/PaginatedResult.java trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/AdcDashboardAction.java trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/BIAction.java trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/EmployeeEditAction.java trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/WikittyRestAction.java trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/AccountAction.java trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/ContactRowForExport.java trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/ContactRowForExportModel.java trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/ExportAction.java trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/QuotationAction.java trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/DashboardProjectAction.java trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/GanttAction.java trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/ProjectsAction.java trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/QuotationData.java trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/QuotationStatusAction.java trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/TaskData.java trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/AcceptedQuotationsReportAction.java trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/AccountSalesReportAction.java trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/FunnelAction.java trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/ProjectSalesReportAction.java trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/QuotationYearData.java trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesData.java trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesPerAccountReportAction.java trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesPerProjectReportAction.java trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesReportAction.java trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesReportHelper.java trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SentQuotationsReportAction.java trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/render/RenderWikitty.java trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/render/RenderWikittyJson.java trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/admin/importExport.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/crm/company.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/crm/project.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/projects/editProject.html trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/projects/projects.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-cancel.html trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-draftToSent.html trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-leadToDraft.html trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-sentToAccepted.html trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-sentToRejected.html trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/menu.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/nuiton-js.properties trunk/chorem-webmotion/src/main/webapp/WEB-INF/wro.xml trunk/chorem-webmotion/src/main/webapp/css/chorem-bi.css trunk/chorem-webmotion/src/main/webapp/css/chorem-crm.css trunk/chorem-webmotion/src/main/webapp/css/chorem-sales.css trunk/chorem-webmotion/src/main/webapp/css/employeeEdit.css trunk/chorem-webmotion/src/main/webapp/css/jquery.fn.gantt.css trunk/chorem-webmotion/src/main/webapp/css/ng-grid.min.css trunk/chorem-webmotion/src/main/webapp/css/select2/select2.css trunk/chorem-webmotion/src/main/webapp/js/dashboardAdc.js trunk/chorem-webmotion/src/main/webapp/js/employeeEdit.js trunk/chorem-webmotion/src/main/webapp/js/jquery.fn.gantt.js trunk/chorem-webmotion/src/main/webapp/js/js-hypercube.min.js trunk/chorem-webmotion/src/main/webapp/js/less-1.3.3.js trunk/chorem-webmotion/src/main/webapp/js/ng-grid-2.0.7.debug.js trunk/chorem-webmotion/src/main/webapp/js/ng-grid-2.0.7.min.js trunk/chorem-webmotion/src/main/webapp/js/ng-select2.js trunk/chorem-webmotion/src/main/webapp/js/ng-wikitty.js trunk/chorem-webmotion/src/main/webapp/js/projectPagination.js trunk/chorem-webmotion/src/main/webapp/js/salesFunnel.js trunk/chorem-webmotion/src/main/webapp/js/select2.min.js trunk/src/site/rst/calculations.rst Modified: trunk/LICENSE.txt =================================================================== --- trunk/LICENSE.txt 2014-02-19 16:29:51 UTC (rev 406) +++ trunk/LICENSE.txt 2014-02-19 16:38:14 UTC (rev 407) @@ -658,4 +658,4 @@ You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. For more information on this, and how to apply and follow the GNU AGPL, see -<http://www.gnu.org/licenses/>. \ No newline at end of file +<http://www.gnu.org/licenses/>. Modified: trunk/chorem-entities/src/main/java/com/inamik/utils/AbstractTableFormatter.java =================================================================== --- trunk/chorem-entities/src/main/java/com/inamik/utils/AbstractTableFormatter.java 2014-02-19 16:29:51 UTC (rev 406) +++ trunk/chorem-entities/src/main/java/com/inamik/utils/AbstractTableFormatter.java 2014-02-19 16:38:14 UTC (rev 407) @@ -6,6 +6,29 @@ */ package com.inamik.utils; +/* + * #%L + * Chorem :: entities + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import java.util.ArrayList; import java.util.List; Modified: trunk/chorem-entities/src/main/java/com/inamik/utils/SimpleTableFormatter.java =================================================================== --- trunk/chorem-entities/src/main/java/com/inamik/utils/SimpleTableFormatter.java 2014-02-19 16:29:51 UTC (rev 406) +++ trunk/chorem-entities/src/main/java/com/inamik/utils/SimpleTableFormatter.java 2014-02-19 16:38:14 UTC (rev 407) @@ -6,6 +6,29 @@ */ package com.inamik.utils; +/* + * #%L + * Chorem :: entities + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import java.util.ArrayList; import java.util.List; Modified: trunk/chorem-entities/src/main/java/com/inamik/utils/TableFormatter.java =================================================================== --- trunk/chorem-entities/src/main/java/com/inamik/utils/TableFormatter.java 2014-02-19 16:29:51 UTC (rev 406) +++ trunk/chorem-entities/src/main/java/com/inamik/utils/TableFormatter.java 2014-02-19 16:38:14 UTC (rev 407) @@ -6,6 +6,29 @@ */ package com.inamik.utils; +/* + * #%L + * Chorem :: entities + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + /** * TableFormatter * Created on Oct 18, 2005 Modified: trunk/chorem-entities/src/main/java/org/chorem/ChoremUtil.java =================================================================== --- trunk/chorem-entities/src/main/java/org/chorem/ChoremUtil.java 2014-02-19 16:29:51 UTC (rev 406) +++ trunk/chorem-entities/src/main/java/org/chorem/ChoremUtil.java 2014-02-19 16:38:14 UTC (rev 407) @@ -1,6 +1,29 @@ package org.chorem; +/* + * #%L + * Chorem :: entities + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2011 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import java.util.ArrayList; import java.util.Arrays; import java.util.Calendar; Modified: trunk/chorem-entities/src/main/java/org/chorem/entities/Quotation18Migration.java =================================================================== --- trunk/chorem-entities/src/main/java/org/chorem/entities/Quotation18Migration.java 2014-02-19 16:29:51 UTC (rev 406) +++ trunk/chorem-entities/src/main/java/org/chorem/entities/Quotation18Migration.java 2014-02-19 16:38:14 UTC (rev 407) @@ -1,5 +1,28 @@ package org.chorem.entities; +/* + * #%L + * Chorem :: entities + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2011 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import org.nuiton.util.VersionUtil; import org.nuiton.wikitty.WikittyService; import org.nuiton.wikitty.WikittyUtil; Modified: trunk/chorem-entities/src/main/java/org/chorem/entities/QuotationMigration.java =================================================================== --- trunk/chorem-entities/src/main/java/org/chorem/entities/QuotationMigration.java 2014-02-19 16:29:51 UTC (rev 406) +++ trunk/chorem-entities/src/main/java/org/chorem/entities/QuotationMigration.java 2014-02-19 16:38:14 UTC (rev 407) @@ -10,12 +10,12 @@ * it under the terms of the GNU Affero General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% Modified: trunk/chorem-entities/src/main/java/org/chorem/entities/VacationMigration.java =================================================================== --- trunk/chorem-entities/src/main/java/org/chorem/entities/VacationMigration.java 2014-02-19 16:29:51 UTC (rev 406) +++ trunk/chorem-entities/src/main/java/org/chorem/entities/VacationMigration.java 2014-02-19 16:38:14 UTC (rev 407) @@ -10,12 +10,12 @@ * it under the terms of the GNU Affero General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% Modified: trunk/chorem-entities/src/main/java/org/chorem/project/AdcCalculation.java =================================================================== --- trunk/chorem-entities/src/main/java/org/chorem/project/AdcCalculation.java 2014-02-19 16:29:51 UTC (rev 406) +++ trunk/chorem-entities/src/main/java/org/chorem/project/AdcCalculation.java 2014-02-19 16:38:14 UTC (rev 407) @@ -1,5 +1,28 @@ package org.chorem.project; +/* + * #%L + * Chorem :: entities + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2011 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import java.util.Calendar; import java.util.Date; import java.util.GregorianCalendar; Modified: trunk/chorem-entities/src/main/java/org/chorem/project/Calculation.java =================================================================== --- trunk/chorem-entities/src/main/java/org/chorem/project/Calculation.java 2014-02-19 16:29:51 UTC (rev 406) +++ trunk/chorem-entities/src/main/java/org/chorem/project/Calculation.java 2014-02-19 16:38:14 UTC (rev 407) @@ -1,5 +1,28 @@ package org.chorem.project; +/* + * #%L + * Chorem :: entities + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2011 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import java.util.HashMap; import java.util.Map; import java.util.Set; Modified: trunk/chorem-entities/src/main/java/org/chorem/project/QuotationCalculation.java =================================================================== --- trunk/chorem-entities/src/main/java/org/chorem/project/QuotationCalculation.java 2014-02-19 16:29:51 UTC (rev 406) +++ trunk/chorem-entities/src/main/java/org/chorem/project/QuotationCalculation.java 2014-02-19 16:38:14 UTC (rev 407) @@ -1,5 +1,28 @@ package org.chorem.project; +/* + * #%L + * Chorem :: entities + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2011 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import java.util.HashMap; import java.util.List; import java.util.Map; Modified: trunk/chorem-entities/src/main/java/org/chorem/project/TaskCalculation.java =================================================================== --- trunk/chorem-entities/src/main/java/org/chorem/project/TaskCalculation.java 2014-02-19 16:29:51 UTC (rev 406) +++ trunk/chorem-entities/src/main/java/org/chorem/project/TaskCalculation.java 2014-02-19 16:38:14 UTC (rev 407) @@ -1,5 +1,28 @@ package org.chorem.project; +/* + * #%L + * Chorem :: entities + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2011 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; Modified: trunk/chorem-entities/src/main/java/org/chorem/project/TotalQuotationCalculation.java =================================================================== --- trunk/chorem-entities/src/main/java/org/chorem/project/TotalQuotationCalculation.java 2014-02-19 16:29:51 UTC (rev 406) +++ trunk/chorem-entities/src/main/java/org/chorem/project/TotalQuotationCalculation.java 2014-02-19 16:38:14 UTC (rev 407) @@ -1,5 +1,28 @@ package org.chorem.project; +/* + * #%L + * Chorem :: entities + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2011 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import java.util.List; import java.util.Map; Modified: trunk/chorem-entities/src/site/rst/gepeto.rst =================================================================== --- trunk/chorem-entities/src/site/rst/gepeto.rst 2014-02-19 16:29:51 UTC (rev 406) +++ trunk/chorem-entities/src/site/rst/gepeto.rst 2014-02-19 16:38:14 UTC (rev 407) @@ -1,3 +1,25 @@ +.. - +.. * #%L +.. * Chorem :: entities +.. * $Id:$ +.. * $HeadURL:$ +.. * %% +.. * Copyright (C) 2011 - 2014 CodeLutin +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU Affero General Public License as published by +.. * the Free Software Foundation, either version 3 of the License, or +.. * (at your option) any later version. +.. * +.. * This program is distributed in the hope that it will be useful, +.. * but WITHOUT ANY WARRANTY; without even the implied warranty of +.. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +.. * GNU General Public License for more details. +.. * +.. * You should have received a copy of the GNU Affero General Public License +.. * along with this program. If not, see <http://www.gnu.org/licenses/>. +.. * #L% +.. - ======================== Gestion de projet Chorem ======================== Modified: trunk/chorem-entities/src/test/java/org/chorem/ChoremUtilTest.java =================================================================== --- trunk/chorem-entities/src/test/java/org/chorem/ChoremUtilTest.java 2014-02-19 16:29:51 UTC (rev 406) +++ trunk/chorem-entities/src/test/java/org/chorem/ChoremUtilTest.java 2014-02-19 16:38:14 UTC (rev 407) @@ -1,6 +1,29 @@ package org.chorem; +/* + * #%L + * Chorem :: entities + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2011 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Assert; Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/PaginatedResult.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/PaginatedResult.java 2014-02-19 16:29:51 UTC (rev 406) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/PaginatedResult.java 2014-02-19 16:38:14 UTC (rev 407) @@ -1,5 +1,28 @@ package org.chorem.webmotion; +/* + * #%L + * Chorem :: webmotion + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2011 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import java.io.Serializable; import java.util.Iterator; import java.util.List; Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/AdcDashboardAction.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/AdcDashboardAction.java 2014-02-19 16:29:51 UTC (rev 406) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/AdcDashboardAction.java 2014-02-19 16:38:14 UTC (rev 407) @@ -1,5 +1,28 @@ package org.chorem.webmotion.actions; +/* + * #%L + * Chorem :: webmotion + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2011 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import java.util.ArrayList; import java.util.Calendar; import java.util.Collections; Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/BIAction.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/BIAction.java 2014-02-19 16:29:51 UTC (rev 406) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/BIAction.java 2014-02-19 16:38:14 UTC (rev 407) @@ -1,6 +1,29 @@ package org.chorem.webmotion.actions; +/* + * #%L + * Chorem :: webmotion + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import java.util.LinkedHashSet; import java.util.List; import org.apache.commons.logging.Log; Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/EmployeeEditAction.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/EmployeeEditAction.java 2014-02-19 16:29:51 UTC (rev 406) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/EmployeeEditAction.java 2014-02-19 16:38:14 UTC (rev 407) @@ -1,5 +1,28 @@ package org.chorem.webmotion.actions; +/* + * #%L + * Chorem :: webmotion + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2011 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import java.util.ArrayList; import java.util.Collections; import java.util.List; Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/WikittyRestAction.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/WikittyRestAction.java 2014-02-19 16:29:51 UTC (rev 406) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/WikittyRestAction.java 2014-02-19 16:38:14 UTC (rev 407) @@ -1,6 +1,29 @@ package org.chorem.webmotion.actions; +/* + * #%L + * Chorem :: webmotion + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import java.util.ArrayList; import java.util.HashMap; import java.util.List; Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/AccountAction.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/AccountAction.java 2014-02-19 16:29:51 UTC (rev 406) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/AccountAction.java 2014-02-19 16:38:14 UTC (rev 407) @@ -1,5 +1,28 @@ package org.chorem.webmotion.actions.crm; +/* + * #%L + * Chorem :: webmotion + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2011 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import org.chorem.ChoremClient; import org.chorem.entities.Accepted; import org.chorem.entities.Attachment; Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/ContactRowForExport.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/ContactRowForExport.java 2014-02-19 16:29:51 UTC (rev 406) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/ContactRowForExport.java 2014-02-19 16:38:14 UTC (rev 407) @@ -1,5 +1,28 @@ package org.chorem.webmotion.actions.crm; +/* + * #%L + * Chorem :: webmotion + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2011 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + /** * * @author couteau Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/ContactRowForExportModel.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/ContactRowForExportModel.java 2014-02-19 16:29:51 UTC (rev 406) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/ContactRowForExportModel.java 2014-02-19 16:38:14 UTC (rev 407) @@ -1,5 +1,28 @@ package org.chorem.webmotion.actions.crm; +/* + * #%L + * Chorem :: webmotion + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2011 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import org.nuiton.csv.ExportModel; import org.nuiton.csv.ExportableColumn; import org.nuiton.csv.ModelBuilder; Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/ExportAction.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/ExportAction.java 2014-02-19 16:29:51 UTC (rev 406) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/ExportAction.java 2014-02-19 16:38:14 UTC (rev 407) @@ -1,5 +1,28 @@ package org.chorem.webmotion.actions.crm; +/* + * #%L + * Chorem :: webmotion + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2011 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import org.apache.commons.io.IOUtils; import org.chorem.ChoremClient; import org.chorem.entities.ContactDetails; Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/QuotationAction.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/QuotationAction.java 2014-02-19 16:29:51 UTC (rev 406) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/QuotationAction.java 2014-02-19 16:38:14 UTC (rev 407) @@ -1,5 +1,28 @@ package org.chorem.webmotion.actions.crm; +/* + * #%L + * Chorem :: webmotion + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2011 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import org.apache.commons.lang3.StringUtils; import org.chorem.ChoremClient; import org.chorem.entities.Quotation; Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/DashboardProjectAction.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/DashboardProjectAction.java 2014-02-19 16:29:51 UTC (rev 406) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/DashboardProjectAction.java 2014-02-19 16:38:14 UTC (rev 407) @@ -1,5 +1,28 @@ package org.chorem.webmotion.actions.project; +/* + * #%L + * Chorem :: webmotion + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2011 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import java.util.ArrayList; import java.util.Arrays; import java.util.Calendar; Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/GanttAction.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/GanttAction.java 2014-02-19 16:29:51 UTC (rev 406) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/GanttAction.java 2014-02-19 16:38:14 UTC (rev 407) @@ -1,5 +1,28 @@ package org.chorem.webmotion.actions.project; +/* + * #%L + * Chorem :: webmotion + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2011 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import java.util.ArrayList; import java.util.Calendar; import java.util.Collections; Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/ProjectsAction.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/ProjectsAction.java 2014-02-19 16:29:51 UTC (rev 406) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/ProjectsAction.java 2014-02-19 16:38:14 UTC (rev 407) @@ -1,5 +1,28 @@ package org.chorem.webmotion.actions.project; +/* + * #%L + * Chorem :: webmotion + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2011 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import com.google.common.collect.ImmutableMap; import org.chorem.ChoremClient; import org.chorem.entities.Project; Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/QuotationData.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/QuotationData.java 2014-02-19 16:29:51 UTC (rev 406) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/QuotationData.java 2014-02-19 16:38:14 UTC (rev 407) @@ -1,5 +1,28 @@ package org.chorem.webmotion.actions.project; +/* + * #%L + * Chorem :: webmotion + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2011 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import java.util.ArrayList; import java.util.Calendar; import java.util.GregorianCalendar; Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/QuotationStatusAction.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/QuotationStatusAction.java 2014-02-19 16:29:51 UTC (rev 406) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/QuotationStatusAction.java 2014-02-19 16:38:14 UTC (rev 407) @@ -1,5 +1,28 @@ package org.chorem.webmotion.actions.project; +/* + * #%L + * Chorem :: webmotion + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2011 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/TaskData.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/TaskData.java 2014-02-19 16:29:51 UTC (rev 406) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/TaskData.java 2014-02-19 16:38:14 UTC (rev 407) @@ -1,6 +1,29 @@ package org.chorem.webmotion.actions.project; +/* + * #%L + * Chorem :: webmotion + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2011 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import org.chorem.ChoremClient; import org.chorem.entities.Task; import org.chorem.project.TaskCalculation; Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/AcceptedQuotationsReportAction.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/AcceptedQuotationsReportAction.java 2014-02-19 16:29:51 UTC (rev 406) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/AcceptedQuotationsReportAction.java 2014-02-19 16:38:14 UTC (rev 407) @@ -1,5 +1,28 @@ package org.chorem.webmotion.actions.sales; +/* + * #%L + * Chorem :: webmotion + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2011 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import org.apache.commons.lang3.time.DateUtils; import org.chorem.ChoremClient; import org.chorem.entities.Accepted; Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/AccountSalesReportAction.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/AccountSalesReportAction.java 2014-02-19 16:29:51 UTC (rev 406) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/AccountSalesReportAction.java 2014-02-19 16:38:14 UTC (rev 407) @@ -1,5 +1,28 @@ package org.chorem.webmotion.actions.sales; +/* + * #%L + * Chorem :: webmotion + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2011 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import org.chorem.ChoremClient; import org.chorem.entities.Accepted; import org.chorem.entities.Quotation; Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/FunnelAction.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/FunnelAction.java 2014-02-19 16:29:51 UTC (rev 406) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/FunnelAction.java 2014-02-19 16:38:14 UTC (rev 407) @@ -1,5 +1,28 @@ package org.chorem.webmotion.actions.sales; +/* + * #%L + * Chorem :: webmotion + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2011 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import org.chorem.ChoremClient; import org.chorem.entities.*; import org.debux.webmotion.server.WebMotionController; Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/ProjectSalesReportAction.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/ProjectSalesReportAction.java 2014-02-19 16:29:51 UTC (rev 406) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/ProjectSalesReportAction.java 2014-02-19 16:38:14 UTC (rev 407) @@ -1,5 +1,28 @@ package org.chorem.webmotion.actions.sales; +/* + * #%L + * Chorem :: webmotion + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2011 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import org.chorem.ChoremClient; import org.chorem.entities.Accepted; import org.chorem.entities.Quotation; Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/QuotationYearData.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/QuotationYearData.java 2014-02-19 16:29:51 UTC (rev 406) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/QuotationYearData.java 2014-02-19 16:38:14 UTC (rev 407) @@ -1,5 +1,28 @@ package org.chorem.webmotion.actions.sales; +/* + * #%L + * Chorem :: webmotion + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2011 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import java.util.Map; /** Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesData.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesData.java 2014-02-19 16:29:51 UTC (rev 406) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesData.java 2014-02-19 16:38:14 UTC (rev 407) @@ -1,5 +1,28 @@ package org.chorem.webmotion.actions.sales; +/* + * #%L + * Chorem :: webmotion + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2011 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + /** * @author jcouteau <couteau(a)codelutin.com> */ Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesPerAccountReportAction.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesPerAccountReportAction.java 2014-02-19 16:29:51 UTC (rev 406) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesPerAccountReportAction.java 2014-02-19 16:38:14 UTC (rev 407) @@ -1,5 +1,28 @@ package org.chorem.webmotion.actions.sales; +/* + * #%L + * Chorem :: webmotion + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2011 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import org.chorem.ChoremClient; import org.chorem.entities.Accepted; import org.chorem.entities.Employee; Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesPerProjectReportAction.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesPerProjectReportAction.java 2014-02-19 16:29:51 UTC (rev 406) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesPerProjectReportAction.java 2014-02-19 16:38:14 UTC (rev 407) @@ -1,5 +1,28 @@ package org.chorem.webmotion.actions.sales; +/* + * #%L + * Chorem :: webmotion + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2011 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import org.chorem.ChoremClient; import org.chorem.entities.Accepted; import org.chorem.entities.Project; Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesReportAction.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesReportAction.java 2014-02-19 16:29:51 UTC (rev 406) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesReportAction.java 2014-02-19 16:38:14 UTC (rev 407) @@ -1,5 +1,28 @@ package org.chorem.webmotion.actions.sales; +/* + * #%L + * Chorem :: webmotion + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2011 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import org.apache.commons.lang.time.DateUtils; import org.chorem.ChoremClient; import org.chorem.entities.Accepted; Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesReportHelper.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesReportHelper.java 2014-02-19 16:29:51 UTC (rev 406) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesReportHelper.java 2014-02-19 16:38:14 UTC (rev 407) @@ -1,5 +1,28 @@ package org.chorem.webmotion.actions.sales; +/* + * #%L + * Chorem :: webmotion + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2011 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import org.chorem.entities.Draft; import org.nuiton.util.DateUtil; import org.nuiton.wikitty.WikittyClient; Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SentQuotationsReportAction.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SentQuotationsReportAction.java 2014-02-19 16:29:51 UTC (rev 406) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SentQuotationsReportAction.java 2014-02-19 16:38:14 UTC (rev 407) @@ -1,5 +1,28 @@ package org.chorem.webmotion.actions.sales; +/* + * #%L + * Chorem :: webmotion + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2011 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import org.apache.commons.lang3.time.DateUtils; import org.chorem.ChoremClient; import org.chorem.entities.Quotation; Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/render/RenderWikitty.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/render/RenderWikitty.java 2014-02-19 16:29:51 UTC (rev 406) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/render/RenderWikitty.java 2014-02-19 16:38:14 UTC (rev 407) @@ -1,5 +1,28 @@ package org.chorem.webmotion.render; +/* + * #%L + * Chorem :: webmotion + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2011 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import com.google.gson.Gson; import org.apache.commons.lang3.StringUtils; import org.debux.webmotion.server.call.Call; Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/render/RenderWikittyJson.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/render/RenderWikittyJson.java 2014-02-19 16:29:51 UTC (rev 406) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/render/RenderWikittyJson.java 2014-02-19 16:38:14 UTC (rev 407) @@ -1,5 +1,28 @@ package org.chorem.webmotion.render; +/* + * #%L + * Chorem :: webmotion + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2011 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import com.google.gson.Gson; import org.apache.commons.lang3.StringUtils; import org.debux.webmotion.server.call.Call; Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/admin/importExport.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/admin/importExport.jsp 2014-02-19 16:29:51 UTC (rev 406) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/admin/importExport.jsp 2014-02-19 16:38:14 UTC (rev 407) @@ -1,3 +1,25 @@ +<%-- + #%L + Chorem :: webmotion + $Id:$ + $HeadURL:$ + %% + Copyright (C) 2011 - 2014 CodeLutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% + --%> <%@page contentType="text/html" pageEncoding="UTF-8"%> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="f" %> Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/crm/company.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/crm/company.jsp 2014-02-19 16:29:51 UTC (rev 406) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/crm/company.jsp 2014-02-19 16:38:14 UTC (rev 407) @@ -0,0 +1,22 @@ +<%-- + #%L + Chorem :: webmotion + $Id:$ + $HeadURL:$ + %% + Copyright (C) 2011 - 2014 CodeLutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% + --%> Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/crm/project.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/crm/project.jsp 2014-02-19 16:29:51 UTC (rev 406) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/crm/project.jsp 2014-02-19 16:38:14 UTC (rev 407) @@ -0,0 +1,22 @@ +<%-- + #%L + Chorem :: webmotion + $Id:$ + $HeadURL:$ + %% + Copyright (C) 2011 - 2014 CodeLutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% + --%> Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/projects/editProject.html =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/projects/editProject.html 2014-02-19 16:29:51 UTC (rev 406) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/projects/editProject.html 2014-02-19 16:38:14 UTC (rev 407) @@ -1,3 +1,25 @@ + <table class="noborder"> <tr> <td>Name:</td> Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/projects/projects.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/projects/projects.jsp 2014-02-19 16:29:51 UTC (rev 406) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/projects/projects.jsp 2014-02-19 16:38:14 UTC (rev 407) @@ -1,3 +1,25 @@ +<%-- + #%L + Chorem :: webmotion + $Id:$ + $HeadURL:$ + %% + Copyright (C) 2011 - 2014 CodeLutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% + --%> <%@page contentType="text/html" pageEncoding="UTF-8"%> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="f" %> Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-cancel.html =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-cancel.html 2014-02-19 16:29:51 UTC (rev 406) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-cancel.html 2014-02-19 16:38:14 UTC (rev 407) @@ -1,3 +1,25 @@ + <div class="modal-header" title="Proposition commerciale annulée"> <h3>Proposition commerciale annulée</h3> </div> Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-draftToSent.html =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-draftToSent.html 2014-02-19 16:29:51 UTC (rev 406) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-draftToSent.html 2014-02-19 16:38:14 UTC (rev 407) @@ -1,3 +1,25 @@ + <div class="modal-header" title="Proposition commerciale envoyée"> <h3>Proposition commerciale envoyée</h3> </div> Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-leadToDraft.html =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-leadToDraft.html 2014-02-19 16:29:51 UTC (rev 406) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-leadToDraft.html 2014-02-19 16:38:14 UTC (rev 407) @@ -1,3 +1,25 @@ + <div class="modal-header" title="Proposition commerciale à envoyer"> <h3>Proposition commerciale à envoyer</h3> </div> Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-sentToAccepted.html =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-sentToAccepted.html 2014-02-19 16:29:51 UTC (rev 406) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-sentToAccepted.html 2014-02-19 16:38:14 UTC (rev 407) @@ -1,3 +1,25 @@ + <div class="modal-header" title="Proposition commerciale acceptée"> <h3>Proposition commerciale acceptée</h3> </div> Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-sentToRejected.html =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-sentToRejected.html 2014-02-19 16:29:51 UTC (rev 406) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-sentToRejected.html 2014-02-19 16:38:14 UTC (rev 407) @@ -1,3 +1,25 @@ + <div class="modal-header" title="Proposition commerciale rejetée"> <h3>Proposition commerciale rejetée</h3> </div> Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/menu.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/menu.jsp 2014-02-19 16:29:51 UTC (rev 406) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/menu.jsp 2014-02-19 16:38:14 UTC (rev 407) @@ -1,3 +1,25 @@ +<%-- + #%L + Chorem :: webmotion + $Id:$ + $HeadURL:$ + %% + Copyright (C) 2011 - 2014 CodeLutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% + --%> <ul class="nav nav-list"> <li><a href="sales"><i class="icon-chevron-right"></i> Ventes</a></li> <li><a href="#"><i class="icon-chevron-right"></i> Ventes par client</a></li> @@ -2,4 +24,4 @@ <li><a href="salesPerProject"><i class="icon-chevron-right"></i> Ventes par projet</a></li> - <li><a href="sentQuotation"><i class="icon-chevron-right"></i> Devis envoy�s</a></li> - <li><a href="acceptedQuotation"><i class="icon-chevron-right"></i> Devis accept�s</a></li> + <li><a href="sentQuotation"><i class="icon-chevron-right"></i> Devis envoy�s</a></li> + <li><a href="acceptedQuotation"><i class="icon-chevron-right"></i> Devis accept�s</a></li> </ul> \ No newline at end of file Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/nuiton-js.properties =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/nuiton-js.properties 2014-02-19 16:29:51 UTC (rev 406) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/nuiton-js.properties 2014-02-19 16:38:14 UTC (rev 407) @@ -1 +1,23 @@ +### +# #%L +# Chorem :: webmotion +# $Id:$ +# $HeadURL:$ +# %% +# Copyright (C) 2011 - 2014 CodeLutin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# #L% +### debug=true Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/wro.xml =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/wro.xml 2014-02-19 16:29:51 UTC (rev 406) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/wro.xml 2014-02-19 16:38:14 UTC (rev 407) @@ -1,3 +1,25 @@ + <groups xmlns="http://www.isdc.ro/wro"> <group name='chorem-lib'> Modified: trunk/chorem-webmotion/src/main/webapp/css/chorem-bi.css =================================================================== --- trunk/chorem-webmotion/src/main/webapp/css/chorem-bi.css 2014-02-19 16:29:51 UTC (rev 406) +++ trunk/chorem-webmotion/src/main/webapp/css/chorem-bi.css 2014-02-19 16:38:14 UTC (rev 407) @@ -1,3 +1,25 @@ +/* + * #%L + * Chorem :: webmotion + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2011 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ .gridStyle { border: 1px solid rgb(212,212,212); width: 800px; Modified: trunk/chorem-webmotion/src/main/webapp/css/chorem-crm.css =================================================================== --- trunk/chorem-webmotion/src/main/webapp/css/chorem-crm.css 2014-02-19 16:29:51 UTC (rev 406) +++ trunk/chorem-webmotion/src/main/webapp/css/chorem-crm.css 2014-02-19 16:38:14 UTC (rev 407) @@ -1,3 +1,25 @@ +/* + * #%L + * Chorem :: webmotion + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2011 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ .contactDetails, .quotationsItem{ background-color: #F5F5F5; border: 1px solid #E3E3E3; Modified: trunk/chorem-webmotion/src/main/webapp/css/chorem-sales.css =================================================================== --- trunk/chorem-webmotion/src/main/webapp/css/chorem-sales.css 2014-02-19 16:29:51 UTC (rev 406) +++ trunk/chorem-webmotion/src/main/webapp/css/chorem-sales.css 2014-02-19 16:38:14 UTC (rev 407) @@ -1,3 +1,25 @@ +/* + * #%L + * Chorem :: webmotion + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2011 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ .salesFunnelItem{ background-color: #F5F5F5; border: 1px solid #E3E3E3; Modified: trunk/chorem-webmotion/src/main/webapp/css/employeeEdit.css =================================================================== --- trunk/chorem-webmotion/src/main/webapp/css/employeeEdit.css 2014-02-19 16:29:51 UTC (rev 406) +++ trunk/chorem-webmotion/src/main/webapp/css/employeeEdit.css 2014-02-19 16:38:14 UTC (rev 407) @@ -1,3 +1,25 @@ +/* + * #%L + * Chorem :: webmotion + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2011 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ .tableEdit tbody tr td input { width:80%; } Modified: trunk/chorem-webmotion/src/main/webapp/css/jquery.fn.gantt.css =================================================================== --- trunk/chorem-webmotion/src/main/webapp/css/jquery.fn.gantt.css 2014-02-19 16:29:51 UTC (rev 406) +++ trunk/chorem-webmotion/src/main/webapp/css/jquery.fn.gantt.css 2014-02-19 16:38:14 UTC (rev 407) @@ -1,3 +1,25 @@ +/* + * #%L + * Chorem :: webmotion + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2011 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ .gantt, .gantt2 { width: 100%; margin: 20px auto; Modified: trunk/chorem-webmotion/src/main/webapp/css/ng-grid.min.css =================================================================== --- trunk/chorem-webmotion/src/main/webapp/css/ng-grid.min.css 2014-02-19 16:29:51 UTC (rev 406) +++ trunk/chorem-webmotion/src/main/webapp/css/ng-grid.min.css 2014-02-19 16:38:14 UTC (rev 407) @@ -1 +1,23 @@ +/* + * #%L + * Chorem :: webmotion + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2011 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ .ngGrid{background-color:#fdfdfd}.ngGrid input[type="checkbox"]{margin:0;padding:0}.ngGrid input{vertical-align:top}.ngGrid.unselectable{-moz-user-select:none;-khtml-user-select:none;-webkit-user-select:none;-o-user-select:none;user-select:none}.ngViewport{overflow:auto;min-height:20px}.ngViewport:focus{outline:0}.ngCanvas{position:relative}.ngVerticalBar{position:absolute;right:0;width:0}.ngVerticalBarVisible{width:1px;background-color:#d4d4d4}.ngHeaderContainer{position:relative;overflow:hidden;font-weight:bold;background-color:inherit}.ngHeaderCell{position:absolute;top:0;bottom:0;background-color:inherit}.ngHeaderCell.pinned{z-index:1}.ngHeaderSortColumn{position:absolute;overflow:hidden}.ngTopPanel{position:relative;z-index:1;background-color:#eaeaea;border-bottom:1px solid #d4d4d4}.ngSortButtonDown{position:absolute;top:3px;left:0;right:0;margin-left:auto;margin-right:auto;border-color:gray transparent;border-style:solid;border-width:0 5px 5px 5px;height:0;width:0}.ngNoSort{cursor:default}.ngHeaderButton{position:absolute;right:2px;top:8px;-moz-border-radius:50%;-webkit-border-radius:50%;border-radius:50%;width:14px;height:14px;z-index:1;background-color:#9fbbb4;cursor:pointer}.ngSortButtonUp{position:absolute;top:3px;left:0;right:0;margin-left:auto;margin-right:auto;border-color:gray transparent;border-style:solid;border-width:5px 5px 0 5px;height:0;width:0}.ngHeaderScroller{position:absolute;background-color:inherit}.ngSortPriority{position:absolute;top:-5px;left:1px;font-size:6pt;font-weight:bold}.ngHeaderGrip{cursor:col-resize;width:10px;right:-5px;top:0;height:100%;position:absolute;background-color:transparent}.ngHeaderText{padding:5px;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box;white-space:nowrap;-ms-text-overflow:ellipsis;-o-text-overflow:ellipsis;text-overflow:ellipsis;overflow:hidden}.ngHeaderButtonArrow{position:absolute;top:4px;left:3px;width:0;height:0;border-style:solid;border-width:6.5px 4.5px 0 4.5px;border-color:#4d4d4d transparent transparent transparent}.ngPinnedIcon{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAOwgAADsIBFShKgAAAABp0RVh0U29mdHdhcmUAUGFpbnQuTkVUIHYzLjUuMTAw9HKhAAAAmElEQVQoU33PQapBURjA8UtkwJuaWYGSgfQWYBMvczPmTCzAAGVuaA228BZhRCkDGSmE31FucuRfvzq3vr5zT/JSjSU7DsypEPXDkDVn2hSIytJhw4kWGaLCxgHh2gt/RBuLzNhz5caWPjnSqqw4EraFfwznf8qklWjwy4IRTerkiQoPGtPl40OehcEJvcfXl8LglLfBJLkDcMgbgHlHhK8AAAAASUVORK5CYII=);background-repeat:no-repeat;position:absolute;right:5px;top:5px;height:10px;width:10px}.ngUnPinnedIcon{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAOwgAADsIBFShKgAAAABp0RVh0U29mdHdhcmUAUGFpbnQuTkVUIHYzLjUuMTAw9HKhAAAAlElEQVQoU33PPQrCQBRF4fFnI2KfZVi5ARvdgo1l6mwmkCJVOgluwd5OwUoDtnoOxAei8cLXTN7cvEl/skCNDCMPfsUPO5zQwOHIDEvYtMURHe6wOVLgigvOePRyeDkyR4ln7wZ//7XfFBu8B23+aDJjrHGAwza7hjtHJvDmHg7b7Bru7AMjK7Rw2ObBVHDY5oGk9AKQNB2zy8MBTgAAAABJRU5ErkJggg==);background-repeat:no-repeat;position:absolute;height:10px;width:10px;right:5px;top:5px}.ngColMenu{right:2px;padding:5px;top:25px;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;background-color:#bdd0cb;position:absolute;border:2px solid #d4d4d4;z-index:1}.ngColListCheckbox{position:relative;right:3px;top:4px}.ngColList{list-style-type:none}.ngColListItem{position:relative;right:17px;top:2px;white-space:nowrap}.ngMenuText{position:relative;top:2px;left:2px}.ngGroupPanel{background-color:#eaeaea;overflow:hidden;border-bottom:1px solid #d4d4d4}.ngGroupPanelDescription{margin-top:5px;margin-left:5px}.ngGroupList{list-style-type:none;margin:0;padding:0}.ngAggHeader{position:absolute;border:0}.ngGroupElement{float:left;height:100%;width:100%}.ngGroupIcon{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAANCAYAAACZ3F9/AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAadEVYdFNvZnR3YXJlAFBhaW50Lk5FVCB2My41LjEwMPRyoQAAAEFJREFUKFNjoAhISkr+h2J5JDZODNXGwGBsbPwfhIGAA8bGh6HaGBiAGhxAGJmND4M1gQCSM0adCsVQbcPcqQwMALWDGyDvWPefAAAAAElFTkSuQmCC);background-repeat:no-repeat;height:15px;width:15px;position:absolute;right:-2px;top:2px}.ngGroupedByIcon{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAANCAYAAACZ3F9/AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAadEVYdFNvZnR3YXJlAFBhaW50Lk5FVCB2My41LjEwMPRyoQAAAElJREFUKFNjoAhISkr+R8LyaHwMDNXGwGBsbPwfhoGAA5mPDUO1oWpE52PDYE0gALTFAYbR+dgwWBMIoPlh1I9ADNU2NPzIwAAAFQYI9E4OLvEAAAAASUVORK5CYII=);background-repeat:no-repeat;height:15px;width:15px;position:absolute;right:-2px;top:2px}.ngGroupName{background-color:#fdfdfd;border:1px solid #d4d4d4;padding:3px 10px;float:left;margin-left:0;margin-top:2px;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;font-weight:bold}.ngGroupArrow{width:0;height:0;border-top:6px solid transparent;border-bottom:6px solid transparent;border-left:6px solid black;margin-top:10px;margin-left:5px;margin-right:5px;float:right}.ngGroupingNumber{position:absolute;right:-10px;top:-2px}.ngAggArrowCollapsed{position:absolute;left:8px;bottom:10px;width:0;height:0;border-style:solid;border-width:5px 0 5px 8.7px;border-color:transparent transparent transparent #000}.ngGroupItem{float:left}.ngGroupItem:first-child{margin-left:2px}.ngRemoveGroup{width:5px;-moz-opacity:.4;opacity:.4;margin-top:-1px;margin-left:5px}.ngRemoveGroup:hover{color:black;text-decoration:none;cursor:pointer;-moz-opacity:.7;opacity:.7}.ngAggArrowExpanded{position:absolute;left:8px;bottom:10px;width:0;height:0;border-style:solid;border-width:0 0 9px 9px;border-color:transparent transparent #000 transparent}.ngAggregate{position:absolute;background-color:#c9dde1;border-bottom:1px solid beige;overflow:hidden;top:0;bottom:0;right:-1px;left:0}.ngAggregateText{position:absolute;left:27px;top:5px;line-height:20px;white-space:nowrap}.ngRow{position:absolute;border-bottom:1px solid #d4d4d4}.ngRow.odd{background-color:#fdfdfd}.ngRow.even{background-color:#f3f3f3}.ngRow.selected{background-color:#c9dde1}.ngCell{overflow:hidden;position:absolute;top:0;bottom:0;background-color:inherit}.ngCell.pinned{z-index:1}.ngCellText{padding:5px;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box;white-space:nowrap;-ms-text-overflow:ellipsis;-o-text-overflow:ellipsis;text-overflow:ellipsis;overflow:hidden}.ngSelectionCell{margin-top:9px;margin-left:6px}.ngSelectionHeader{position:absolute;top:11px;left:6px}.ngCellElement:focus{outline:0;background-color:#b3c4c7}.ngRow.canSelect{cursor:pointer}.ngSelectionCheckbox{margin-top:9px;margin-left:6px}.ngFooterPanel{background-color:#eaeaea;padding:0;border-top:1px solid #d4d4d4;position:relative}.nglabel{display:block;float:left;font-weight:bold;padding-right:5px}.ngTotalSelectContainer{float:left;margin:5px;margin-top:7px}.ngFooterSelectedItems{padding:2px}.ngFooterTotalItems.ngnoMultiSelect{padding:0!important}.ngPagerFirstBar{width:10px;border-left:2px solid #4d4d4d;margin-top:-6px;height:12px;margin-left:-3px}.ngPagerButton{height:25px;min-width:26px}.ngPagerFirstTriangle{width:0;height:0;border-style:solid;border-width:5px 8.7px 5px 0;border-color:transparent #4d4d4d transparent transparent;margin-left:2px}.ngPagerNextTriangle{margin-left:1px}.ngPagerPrevTriangle{margin-left:0}.ngPagerLastTriangle{width:0;height:0;border-style:solid;border-width:5px 0 5px 8.7px;border-color:transparent transparent transparent #4d4d4d;margin-left:-1px}.ngPagerLastBar{width:10px;border-left:2px solid #4d4d4d;margin-top:-6px;height:12px;margin-left:1px}.ngFooterTotalItems{padding:2px} \ No newline at end of file Modified: trunk/chorem-webmotion/src/main/webapp/css/select2/select2.css =================================================================== --- trunk/chorem-webmotion/src/main/webapp/css/select2/select2.css 2014-02-19 16:29:51 UTC (rev 406) +++ trunk/chorem-webmotion/src/main/webapp/css/select2/select2.css 2014-02-19 16:38:14 UTC (rev 407) @@ -1,4 +1,26 @@ /* + * #%L + * Chorem :: webmotion + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2011 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +/* Version: 3.4.1 Timestamp: Thu Jun 27 18:02:10 PDT 2013 */ .select2-container { Modified: trunk/chorem-webmotion/src/main/webapp/js/dashboardAdc.js =================================================================== --- trunk/chorem-webmotion/src/main/webapp/js/dashboardAdc.js 2014-02-19 16:29:51 UTC (rev 406) +++ trunk/chorem-webmotion/src/main/webapp/js/dashboardAdc.js 2014-02-19 16:38:14 UTC (rev 407) @@ -1,3 +1,25 @@ +/* + * #%L + * Chorem :: webmotion + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2011 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ $(document).ready(function() { Modified: trunk/chorem-webmotion/src/main/webapp/js/employeeEdit.js =================================================================== --- trunk/chorem-webmotion/src/main/webapp/js/employeeEdit.js 2014-02-19 16:29:51 UTC (rev 406) +++ trunk/chorem-webmotion/src/main/webapp/js/employeeEdit.js 2014-02-19 16:38:14 UTC (rev 407) @@ -1,3 +1,25 @@ +/* + * #%L + * Chorem :: webmotion + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2011 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ $(document).ready(function() { Modified: trunk/chorem-webmotion/src/main/webapp/js/jquery.fn.gantt.js =================================================================== --- trunk/chorem-webmotion/src/main/webapp/js/jquery.fn.gantt.js 2014-02-19 16:29:51 UTC (rev 406) +++ trunk/chorem-webmotion/src/main/webapp/js/jquery.fn.gantt.js 2014-02-19 16:38:14 UTC (rev 407) @@ -1,3 +1,25 @@ +/* + * #%L + * Chorem :: webmotion + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2011 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ // jQuery Gantt Chart // ================== Modified: trunk/chorem-webmotion/src/main/webapp/js/js-hypercube.min.js =================================================================== --- trunk/chorem-webmotion/src/main/webapp/js/js-hypercube.min.js 2014-02-19 16:29:51 UTC (rev 406) +++ trunk/chorem-webmotion/src/main/webapp/js/js-hypercube.min.js 2014-02-19 16:38:14 UTC (rev 407) @@ -1 +1,23 @@ +/* + * #%L + * Chorem :: webmotion + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2011 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ var ps=Object.create?Object.create(null):{};ps.addSingletonGetter=function(a){a.getInstance=function(){return a.instance_||a.setInstance.apply(this,arguments)};a.hasInstance=function(){return !!a.instance_};a.setInstance=function(){return a.instance_=new a(arguments[0],arguments[1],arguments[2],arguments[3],arguments[4],arguments[5],arguments[6],arguments[7])};a.deleteInstance=function(){a.instance_=null}};ps.addCloning=function(a){a.prototype.clone=function(){var c=$.extend(true,new a(),this);var b=function(e){var d;for(name in e){d=e[name];if(!d instanceof Object){continue}else{if(d===e){continue}else{if(d.clone){e[name]=d.clone();continue}}}b(d)}};b(c);return c}};ps.inherits=function(b,a){function c(){}c.prototype=a.prototype;b.superClass_=a.prototype;b.prototype=new c();b.prototype.constructor=b};ps.time=function(){return Math.floor(ps.microTime()/1000)};ps.microTime=Date.now||(function(){return +new Date()});ps.timezone=function(){return Math.floor((new Date()).getTimezoneOffset()/60)*-1};ps.obj=function(){return Object.create?Object.create(null):{}};ps.isDef=function(a){return a!==undefined};ps.isNull=function(a){return a===null};ps.isDefAndNotNull=function(a){return a!=null};ps.isString=function(a){return typeof a=="string"};ps.isBoolean=function(a){return typeof a=="boolean"};ps.isNumber=function(a){return(typeof a=="number")&&!isNaN(a)&&isFinite(a)};ps.isFunction=function(a){return $.isFunction(a)};ps.isObject=function(a){return typeof a==="object"};ps.isPlainObject=function(a){return $.isPlainObject(a)};ps.isArray=function(a){return $.isArray(a)};ps.isElement=function(a){return ps.isObject(a)&&a.nodeType===1};ps.uid=function(){return ps._uidCounter++};ps._uidCounter=1000;ps.uniqueElementId=function(){return"_idgen_"+ps.uid()};ps.redirect=function(a){if(a){window.document.location.replace(a)}else{window.document.location.reload(true)}};ps.navigateTo=function(a){try{window.document.location.href=a}catch(b){}};ps.array={contains:function(d,c){for(var b=0,a=d.length;b<a;++b){if(d[b]===c){return true}}return false},unique:function(d){var c=[];for(var b=0,a=d.length;b<a;++b){if(!ps.array.contains(c,d[b])){c.push(d[b])}}return c},diff:function(f,e){var d=[],g,b=ps.array.pivot(e);for(var c=0,a=f.length;c<a;++c){g=f[c];if(!ps.isDef(b[g])){d.push(g)}}return d},intersect:function(e,d){var c=[];for(var b=0,a=e.length;b<a;++b){if(ps.array.contains(d,e[b])){c.push(e[b])}}return c},union:function(b,a){a=Array.prototype.slice.apply(arguments).slice(1);return Array.prototype.concat.apply(b,a)},clone:function(a){return ps.array.union([],a)},keys:function(b){var a=[];$.each(b,function(d,c){a.push(d)});return a},vals:function(b){var a=[];$.each(b,function(d,c){a.push(c)});return a},combine:function(d,a){var c=(d.length<=a.length?d.length:a.length),e=ps.obj();for(var b=0;b<c;++b){e[d[b]]=a[b]}return e},pivot:function(b){var a=ps.obj();$.each(b,function(d,c){a[c]=d});return a},randSort:function(a){a.sort(function(d,c){return 0.5-Math.random()});return a}};ps.object={contains:ps.array.contains,keys:ps.array.keys,vals:ps.array.vals,combine:ps.array.combine,fill:function(c,d){var e=ps.obj();for(var b=0,a=c.length;b<a;++b){e[c[b]]=d}return e}};ps.FactIndex=function(){this._slabs=ps.obj();this._factValues=[]};ps.FactIndex.prototype.getFactValues=function(){if(!this._factValues.length){this._factValues=ps.array.keys(this._slabs);this._factValues.sort()}return this._factValues};ps.FactIndex.prototype.get=function(a){return this._slabs[a]};ps.FactIndex.prototype.insert=function(c,b){this._factValues=[];var a=this._slabs[c];if(!ps.isDef(a)){a=[];this._slabs[c]=a}a.push(b)};ps.Cell=function(c,b,a){this.time=a?a:null;this.facts=c;this.measures=b};ps.addCloning(ps.Cell);ps.Cell.prototype.value=function(a){return ps.isNumber(this.measures[a])?this.measures[a]:0};ps.Cell.aggregate=function(b,d){var e=ps.obj();if(!b||!b.length){return e}for(var c=0,a=b.length;c<a;++c){$.each(b[c].measures,function(f,g){e[f]=d(e[f],g)})}return e};ps.Cell.getComparisonFn=function(a,b){return function(d,c){var e=d.value(a)-c.value(a);return b?e*-1:e}};ps.Cube=function(a){this._indecies=ps.obj();this._cells=[];this._factNames=[];this._measureNames=ps.isArray(a)?a:null};ps.Cube.prototype.count=function(){return this._cells.length};ps.Cube.prototype.getFactNames=function(){if(!this._factNames.length){this._factNames=ps.array.keys(this._indecies);this._factNames.sort()}return this._factNames};ps.Cube.prototype.getValues=function(d){var b=[];for(var c=0,a=this._cells.length;c<a;++c){value=this._cells[c].facts[d];if(value){b.push(value)}}return ps.array.unique(b)};ps.Cube.prototype.insert=function(b){this._factNames=[];var a=this._cells.length,c;$.each(b.facts,$.proxy(function(e,d){c=this._indecies[e];if(!ps.isDef(c)){c=new ps.FactIndex();this._indecies[e]=c}c.insert(d,a)},this));this._cells.push(b)};ps.Cube.prototype._getPos=function(d){var a,c,b;$.each(d,$.proxy(function(f,e){b=this._indecies[f];if(!ps.isDef(b)){a=[];return false}c=b.get(e);if(!ps.isDef(c)){a=[];return false}if(a){a=ps.array.intersect(a,c)}else{a=c}if(!a.length){a=[];return false}},this));return a};ps.Cube.prototype.slice=function(d){var e=new ps.Cube(this._measureNames),a=this._getPos(d);for(var c=0,b=a.length;c<b;++c){e.insert(this._cells[a[c]])}return e};ps.Cube.prototype.sliceDates=function(g,e){var a=new ps.Cube(this._measureNames),c=this._cells,f;for(var d=0,b=c.length;d<b;++d){if(c[d].time>=g&&c[d].time<e){a.insert(c[d])}}return a};ps.Cube.prototype.dice=function(e){var c=new ps.Cube(this._measureNames),a=this._getPos(e);a=ps.array.diff(ps.array.keys(this._cells),a);for(var d=0,b=a.length;d<b;++d){c.insert(this._cells[a[d]])}return c};ps.Cube.prototype.merge=function(a){for(var c=0,b=a._cells.length;c<b;++c){this.insert(a._cells[c])}};ps.Cube.prototype.sum=function(a){if(!this._cells.length){if(this._measureNames){return ps.object.fill(this._measureNames,0)}return ps.obj()}return ps.Cell.aggregate(this._cells,function(b,c){if(ps.isNumber(a)){c=parseFloat(c.toPrecision(a),10)}if(ps.isDef(b)){b+=c}else{b=c}return b})};ps.Cube.prototype.avg=function(d,a){var c=this.sum(a),e=ps.obj(),b=false;$.each(c,function(f,g){b=true;g=g?g/d:g;if(ps.isNumber(a)){g=parseFloat(g.toPrecision(a),10)}e[f]=g});if(!b&&this._measureNames){return ps.object.fill(this._measureNames,0)}return e};ps.Cube.prototype.serialize=function(){var d=[],e,a;for(var c=0,b=this._cells.length;c<b;++c){a=this._cells[c];e=ps.obj();e.facts=a.facts;e.measures=a.measures;d.push(e)}return d};ps.Cube.deserialize=function(f,e){var a=new ps.Cube(e),c;for(var d=0,b=f.length;d<b;++d){c=f[d];a.insert(new ps.Cell(c.facts,c.measures,c.time*1000))}return a};ps.Cube.transforms=ps.obj();ps.Cube.transforms.dateLocal=function(b){var a=["Sun","Mon","Tue","Wed","Thu","Fri","Sat"];$.each(b,function(e,c){if(!c.time||!c.facts){console.error("record is missing necessary properties. halting.",c);return false}var d=new Date(c.time*1000);c.facts.year=d.getFullYear();c.facts.month=d.getMonth()+1;c.facts.day=d.getDate();c.facts.hour=d.getHours();c.facts.day_of_week=a[d.getDay()]})}; \ No newline at end of file Modified: trunk/chorem-webmotion/src/main/webapp/js/less-1.3.3.js =================================================================== --- trunk/chorem-webmotion/src/main/webapp/js/less-1.3.3.js 2014-02-19 16:29:51 UTC (rev 406) +++ trunk/chorem-webmotion/src/main/webapp/js/less-1.3.3.js 2014-02-19 16:38:14 UTC (rev 407) @@ -1,3 +1,25 @@ +/* + * #%L + * Chorem :: webmotion + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2011 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ // // LESS - Leaner CSS v1.3.3 // http://lesscss.org Modified: trunk/chorem-webmotion/src/main/webapp/js/ng-grid-2.0.7.debug.js =================================================================== --- trunk/chorem-webmotion/src/main/webapp/js/ng-grid-2.0.7.debug.js 2014-02-19 16:29:51 UTC (rev 406) +++ trunk/chorem-webmotion/src/main/webapp/js/ng-grid-2.0.7.debug.js 2014-02-19 16:38:14 UTC (rev 407) @@ -1,3 +1,25 @@ +/* + * #%L + * Chorem :: webmotion + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2011 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ /*********************************************** * ng-grid JavaScript Library * Authors: https://github.com/angular-ui/ng-grid/blob/master/README.md Modified: trunk/chorem-webmotion/src/main/webapp/js/ng-grid-2.0.7.min.js =================================================================== --- trunk/chorem-webmotion/src/main/webapp/js/ng-grid-2.0.7.min.js 2014-02-19 16:29:51 UTC (rev 406) +++ trunk/chorem-webmotion/src/main/webapp/js/ng-grid-2.0.7.min.js 2014-02-19 16:38:14 UTC (rev 407) @@ -1,2 +1,24 @@ +/* + * #%L + * Chorem :: webmotion + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2011 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ (function(e,t){"use strict";var n=6,o=4,i="asc",r="desc",l="_ng_field_",a="_ng_depth_",s="_ng_hidden_",c="_ng_column_",g=/CUSTOM_FILTERS/g,d=/COL_FIELD/g,u=/DISPLAY_CELL_TEMPLATE/g,f=/EDITABLE_CELL_TEMPLATE/g,h=/<.+>/;e.ngGrid={},e.ngGrid.i18n={},angular.module("ngGrid.services",[]);var p=angular.module("ngGrid.directives",[]),m=angular.module("ngGrid.filters",[]);angular.module("ngGrid",["ngGrid.services","ngGrid.directives","ngGrid.filters"]);var v=function(e,t,o,i){if(void 0===e.selectionProvider.selectedItems)return!0;var r,l=o.which||o.keyCode,a=!1,s=!1,c=void 0===e.selectionProvider.lastClickedRow?1:e.selectionProvider.lastClickedRow.rowIndex,g=e.columns.filter(function(e){return e.visible}),d=e.columns.filter(function(e){return e.pinned});if(e.col&&(r=g.indexOf(e.col)),37!==l&&38!==l&&39!==l&&40!==l&&9!==l&&13!==l)return!0;if(e.enableCellSelection){9===l&&o.preventDefault();var u=e.showSelectionCheckbox?1===e.col.index:0===e.col.index,f=1===e.$index||0===e.$index,h=e.$index===e.renderedColumns.length-1||e.$index===e.renderedColumns.length-2,p=g.indexOf(e.col)===g.length-1,m=d.indexOf(e.col)===d.length-1;if(37===l||9===l&&o.shiftKey){var v=0;u||(r-=1),f?u&&9===l&&o.shiftKey?(v=i.$canvas.width(),r=g.length-1,s=!0):v=i.$viewport.scrollLeft()-e.col.width:d.length>0&&(v=i.$viewport.scrollLeft()-g[r].width),i.$viewport.scrollLeft(v)}else(39===l||9===l&&!o.shiftKey)&&(h?p&&9===l&&!o.shiftKey?(i.$viewport.scrollLeft(0),r=e.showSelectionCheckbox?1:0,a=!0):i.$viewport.scrollLeft(i.$viewport.scrollLeft()+e.col.width):m&&i.$viewport.scrollLeft(0),p||(r+=1))}var w;w=e.configGroups.length>0?i.rowFactory.parsedData.filter(function(e){return!e.isAggRow}):i.filteredRows;var C=0;if(0!==c&&(38===l||13===l&&o.shiftKey||9===l&&o.shiftKey&&s)?C=-1:c!==w.length-1&&(40===l||13===l&&!o.shiftKey||9===l&&a)&&(C=1),C){var b=w[c+C];b.beforeSelectionChange(b,o)&&(b.continueSelection(o),e.$emit("ngGridEventDigestGridParent"),e.selectionProvider.lastClickedRow.renderedRowIndex>=e.renderedRows.length-n-2?i.$viewport.scrollTop(i.$viewport.scrollTop()+e.rowHeight):n+2>=e.selectionProvider.lastClickedRow.renderedRowIndex&&i.$viewport.scrollTop(i.$viewport.scrollTop()-e.rowHeight))}return e.enableCellSelection&&setTimeout(function(){e.domAccessProvider.focusCellElement(e,e.renderedColumns.indexOf(g[r]))},3),!1};String.prototype.trim||(String.prototype.trim=function(){return this.replace(/^\s+|\s+$/g,"")}),Array.prototype.indexOf||(Array.prototype.indexOf=function(e){var t=this.length>>>0,n=Number(arguments[1])||0;for(n=0>n?Math.ceil(n):Math.floor(n),0>n&&(n+=t);t>n;n++)if(n in this&&this[n]===e)return n;return-1}),Array.prototype.filter||(Array.prototype.filter=function(e){var t=Object(this),n=t.length>>>0;if("function"!=typeof e)throw new TypeError;for(var o=[],i=arguments[1],r=0;n>r;r++)if(r in t){var l=t[r];e.call(i,l,r,t)&&o.push(l)}return o}),m.filter("checkmark",function(){return function(e){return e?"✔":"✘"}}),m.filter("ngColumns",function(){return function(e){return e.filter(function(e){return!e.isAggCol})}}),angular.module("ngGrid.services").factory("$domUtilityService",["$utilityService",function(e){var n={},o={},i=function(){var e=t("<div></div>");e.appendTo("body"),e.height(100).width(100).css("position","absolute").css("overflow","scroll"),e.append('<div style="height: 400px; width: 400px;"></div>'),n.ScrollH=e.height()-e[0].clientHeight,n.ScrollW=e.width()-e[0].clientWidth,e.empty(),e.attr("style",""),e.append('<span style="font-family: Verdana, Helvetica, Sans-Serif; font-size: 14px;"><strong>M</strong></span>'),n.LetterW=e.children().first().width(),e.remove()};return n.eventStorage={},n.AssignGridContainers=function(e,o,i){i.$root=t(o),i.$topPanel=i.$root.find(".ngTopPanel"),i.$groupPanel=i.$root.find(".ngGroupPanel"),i.$headerContainer=i.$topPanel.find(".ngHeaderContainer"),e.$headerContainer=i.$headerContainer,i.$headerScroller=i.$topPanel.find(".ngHeaderScroller"),i.$headers=i.$headerScroller.children(),i.$viewport=i.$root.find(".ngViewport"),i.$canvas=i.$viewport.find(".ngCanvas"),i.$footerPanel=i.$root.find(".ngFooterPanel"),e.$watch(function(){return i.$viewport.scrollLeft()},function(e){return i.$headerContainer.scrollLeft(e)}),n.UpdateGridLayout(e,i)},n.getRealWidth=function(e){var n=0,o={visibility:"hidden",display:"block"},i=e.parents().andSelf().not(":visible");return t.swap(i[0],o,function(){n=e.outerWidth()}),n},n.UpdateGridLayout=function(e,t){var o=t.$viewport.scrollTop();t.elementDims.rootMaxW=t.$root.width(),t.$root.is(":hidden")&&(t.elementDims.rootMaxW=n.getRealWidth(t.$root)),t.elementDims.rootMaxH=t.$root.height(),t.refreshDomSizes(),e.adjustScrollTop(o,!0)},n.numberOfGrids=0,n.BuildStyles=function(o,i,r){var l,a=i.config.rowHeight,s=i.$styleSheet,c=i.gridId,g=o.columns,d=0;s||(s=t("#"+c),s[0]||(s=t("<style id='"+c+"' type='text/css' rel='stylesheet' />").appendTo(i.$root))),s.empty();var u=o.totalRowWidth();l="."+c+" .ngCanvas { width: "+u+"px; }"+"."+c+" .ngRow { width: "+u+"px; }"+"."+c+" .ngCanvas { width: "+u+"px; }"+"."+c+" .ngHeaderScroller { width: "+(u+n.ScrollH)+"px}";for(var f=0;g.length>f;f++){var h=g[f];h.visible!==!1&&(l+="."+c+" .col"+f+" { width: "+h.width+"px; left: "+d+"px; height: "+a+"px }"+"."+c+" .colt"+f+" { width: "+h.width+"px; }",d+=h.width)}e.isIe?s[0].styleSheet.cssText=l:s[0].appendChild(document.createTextNode(l)),i.$styleSheet=s,o.adjustScrollLeft(i.$viewport.scrollLeft()),r&&n.digest(o)},n.setColLeft=function(t,n,i){if(i.$styleSheet){var r=o[t.index];r||(r=o[t.index]=RegExp(".col"+t.index+" { width: [0-9]+px; left: [0-9]+px"));var l=i.$styleSheet.html(),a=l.replace(r,".col"+t.index+" { width: "+t.width+"px; left: "+n+"px");e.isIe?setTimeout(function(){i.$styleSheet.html(a)}):i.$styleSheet.html(a)}},n.setColLeft.immediate=1,n.RebuildGrid=function(e,t){n.UpdateGridLayout(e,t),(null==t.config.maintainColumnRatios||t.config.maintainColumnRatios)&&t.configureColumnWidths(),e.adjustScrollLeft(t.$viewport.scrollLeft()),n.BuildStyles(e,t,!0)},n.digest=function(e){e.$root.$$phase||e.$digest()},n.ScrollH=17,n.ScrollW=17,n.LetterW=10,i(),n}]),angular.module("ngGrid.services").factory("$sortService",["$parse",function(e){var t={};return t.colSortFnCache={},t.guessSortFn=function(e){var n=typeof e;switch(n){case"number":return t.sortNumber;case"boolean":return t.sortBool;case"string":return e.match(/^[-+]?[£$¤]?[\d,.]+%?$/)?t.sortNumberStr:t.sortAlpha;default:return"[object Date]"===Object.prototype.toString.call(e)?t.sortDate:t.basicSort}},t.basicSort=function(e,t){return e===t?0:t>e?-1:1},t.sortNumber=function(e,t){return e-t},t.sortNumberStr=function(e,t){var n,o,i=!1,r=!1;return n=parseFloat(e.replace(/[^0-9.-]/g,"")),isNaN(n)&&(i=!0),o=parseFloat(t.replace(/[^0-9.-]/g,"")),isNaN(o)&&(r=!0),i&&r?0:i?1:r?-1:n-o},t.sortAlpha=function(e,t){var n=e.toLowerCase(),o=t.toLowerCase();return n===o?0:o>n?-1:1},t.sortDate=function(e,t){var n=e.getTime(),o=t.getTime();return n===o?0:o>n?-1:1},t.sortBool=function(e,t){return e&&t?0:e||t?e?1:-1:0},t.sortData=function(n,o){if(o&&n){var r,l,a=n.fields.length,s=n.fields,c=o.slice(0);o.sort(function(o,g){for(var d,u=0,f=0;0===u&&a>f;){r=n.columns[f],l=n.directions[f],d=t.getSortFn(r,c);var h=e(s[f])(o),p=e(s[f])(g);!h&&0!==h||!p&&0!==p?p||h?h?p||(u=-1):u=1:u=0:u=d(h,p),f++}return l===i?u:0-u})}},t.Sort=function(e,n){t.isSorting||(t.isSorting=!0,t.sortData(e,n),t.isSorting=!1)},t.getSortFn=function(n,o){var i,r;if(t.colSortFnCache[n.field])i=t.colSortFnCache[n.field];else if(void 0!==n.sortingAlgorithm)i=n.sortingAlgorithm,t.colSortFnCache[n.field]=n.sortingAlgorithm;else{if(r=o[0],!r)return i;i=t.guessSortFn(e(n.field)(r)),i?t.colSortFnCache[n.field]=i:i=t.sortAlpha}return i},t}]),angular.module("ngGrid.services").factory("$utilityService",["$parse",function(n){var o=/function (.{1,})\(/,i={visualLength:function(e){var n=document.getElementById("testDataLength");return n||(n=document.createElement("SPAN"),n.id="testDataLength",n.style.visibility="hidden",document.body.appendChild(n)),t(n).css("font",t(e).css("font")),t(n).css("font-size",t(e).css("font-size")),t(n).css("font-family",t(e).css("font-family")),n.innerHTML=t(e).text(),n.offsetWidth},forIn:function(e,t){for(var n in e)e.hasOwnProperty(n)&&t(e[n],n)},evalProperty:function(e,t){return n(t)(e)},endsWith:function(e,t){return e&&t&&"string"==typeof e?-1!==e.indexOf(t,e.length-t.length):!1},isNullOrUndefined:function(e){return void 0===e||null===e?!0:!1},getElementsByClassName:function(e){for(var t=[],n=RegExp("\\b"+e+"\\b"),o=document.getElementsByTagName("*"),i=0;o.length>i;i++){var r=o[i].className;n.test(r)&&t.push(o[i])}return t},newId:function(){var e=(new Date).getTime();return function(){return e+=1}}(),seti18n:function(t,n){var o=e.ngGrid.i18n[n];for(var i in o)t.i18n[i]=o[i]},getInstanceType:function(e){var t=o.exec(""+e.constructor);if(t&&t.length>1){var n=t[1].replace(/^\s+|\s+$/g,"");return n}return""},ieVersion:function(){var e=3,t=document.createElement("div"),n=t.getElementsByTagName("i");do t.innerHTML="";while(n[0]);return e>4?e:void 0}()};return t.extend(i,{isIe:function(){return void 0!==i.ieVersion}()}),i}]);var w=function(e,t,n,o){this.rowIndex=0,this.offsetTop=this.rowIndex*n,this.entity=e,this.label=e.gLabel,this.field=e.gField,this.depth=e.gDepth,this.parent=e.parent,this.children=e.children,this.aggChildren=e.aggChildren,this.aggIndex=e.aggIndex,this.collapsed=o,this.groupInitState=o,this.rowFactory=t,this.rowHeight=n,this.isAggRow=!0,this.offsetLeft=25*e.gDepth,this.aggLabelFilter=e.aggLabelFilter};w.prototype.toggleExpand=function(){this.collapsed=this.collapsed?!1:!0,this.orig&&(this.orig.collapsed=this.collapsed),this.notifyChildren()},w.prototype.setExpand=function(e){this.collapsed=e,this.notifyChildren()},w.prototype.notifyChildren=function(){for(var e=Math.max(this.rowFactory.aggCache.length,this.children.length),t=0;e>t;t++)if(this.aggChildren[t]&&(this.aggChildren[t].entity[s]=this.collapsed,this.collapsed&&this.aggChildren[t].setExpand(this.collapsed)),this.children[t]&&(this.children[t][s]=this.collapsed),t>this.aggIndex&&this.rowFactory.aggCache[t]){var n=this.rowFactory.aggCache[t],o=30*this.children.length;n.offsetTop=this.collapsed?n.offsetTop-o:n.offsetTop+o}this.rowFactory.renderedChange()},w.prototype.aggClass=function(){return this.collapsed?"ngAggArrowCollapsed":"ngAggArrowExpanded"},w.prototype.totalChildren=function(){if(this.aggChildren.length>0){var e=0,t=function(n){n.aggChildren.length>0?angular.forEach(n.aggChildren,function(e){t(e)}):e+=n.children.length};return t(this),e}return this.children.length},w.prototype.copy=function(){var e=new w(this.entity,this.rowFactory,this.rowHeight,this.groupInitState);return e.orig=this,e};var C=function(e,n,o,l,a,s){var c=this,d=e.colDef,u=500,f=0,p=null;c.colDef=e.colDef,c.width=d.width,c.groupIndex=0,c.isGroupedBy=!1,c.minWidth=d.minWidth?d.minWidth:50,c.maxWidth=d.maxWidth?d.maxWidth:9e3,c.enableCellEdit=void 0!==d.enableCellEdit?d.enableCellEdit:e.enableCellEdit||e.enableCellEditOnFocus,c.headerRowHeight=e.headerRowHeight,c.displayName=void 0===d.displayName?d.field:d.displayName,c.index=e.index,c.isAggCol=e.isAggCol,c.cellClass=d.cellClass,c.sortPriority=void 0,c.cellFilter=d.cellFilter?d.cellFilter:"",c.field=d.field,c.aggLabelFilter=d.cellFilter||d.aggLabelFilter,c.visible=s.isNullOrUndefined(d.visible)||d.visible,c.sortable=!1,c.resizable=!1,c.pinnable=!1,c.pinned=e.enablePinning&&d.pinned,c.originalIndex=null==e.originalIndex?c.index:e.originalIndex,c.groupable=s.isNullOrUndefined(d.groupable)||d.groupable,e.enableSort&&(c.sortable=s.isNullOrUndefined(d.sortable)||d.sortable),e.enableResize&&(c.resizable=s.isNullOrUndefined(d.resizable)||d.resizable),e.enablePinning&&(c.pinnable=s.isNullOrUndefined(d.pinnable)||d.pinnable),c.sortDirection=void 0,c.sortingAlgorithm=d.sortFn,c.headerClass=d.headerClass,c.cursor=c.sortable?"pointer":"default",c.headerCellTemplate=d.headerCellTemplate||a.get("headerCellTemplate.html"),c.cellTemplate=d.cellTemplate||a.get("cellTemplate.html").replace(g,c.cellFilter?"|"+c.cellFilter:""),c.enableCellEdit&&(c.cellEditTemplate=a.get("cellEditTemplate.html"),c.editableCellTemplate=d.editableCellTemplate||a.get("editableCellTemplate.html")),d.cellTemplate&&!h.test(d.cellTemplate)&&(c.cellTemplate=t.ajax({type:"GET",url:d.cellTemplate,async:!1}).responseText),c.enableCellEdit&&d.editableCellTemplate&&!h.test(d.editableCellTemplate)&&(c.editableCellTemplate=t.ajax({type:"GET",url:d.editableCellTemplate,async:!1}).responseText),d.headerCellTemplate&&!h.test(d.headerCellTemplate)&&(c.headerCellTemplate=t.ajax({type:"GET",url:d.headerCellTemplate,async:!1}).responseText),c.colIndex=function(){var e=c.pinned?"pinned ":"";return e+="col"+c.index+" colt"+c.index,c.cellClass&&(e+=" "+c.cellClass),e},c.groupedByClass=function(){return c.isGroupedBy?"ngGroupedByIcon":"ngGroupIcon"},c.toggleVisible=function(){c.visible=!c.visible},c.showSortButtonUp=function(){return c.sortable?c.sortDirection===r:c.sortable},c.showSortButtonDown=function(){return c.sortable?c.sortDirection===i:c.sortable},c.noSortVisible=function(){return!c.sortDirection},c.sort=function(t){if(!c.sortable)return!0;var n=c.sortDirection===i?r:i;return c.sortDirection=n,e.sortCallback(c,t),!1},c.gripClick=function(){f++,1===f?p=setTimeout(function(){f=0},u):(clearTimeout(p),e.resizeOnDataCallback(c),f=0)},c.gripOnMouseDown=function(e){return n.isColumnResizing=!0,e.ctrlKey&&!c.pinned?(c.toggleVisible(),l.BuildStyles(n,o),!0):(e.target.parentElement.style.cursor="col-resize",c.startMousePosition=e.clientX,c.origWidth=c.width,t(document).mousemove(c.onMouseMove),t(document).mouseup(c.gripOnMouseUp),!1)},c.onMouseMove=function(e){var t=e.clientX-c.startMousePosition,i=t+c.origWidth;return c.width=c.minWidth>i?c.minWidth:i>c.maxWidth?c.maxWidth:i,n.hasUserChangedGridColumnWidths=!0,l.BuildStyles(n,o),!1},c.gripOnMouseUp=function(e){return t(document).off("mousemove",c.onMouseMove),t(document).off("mouseup",c.gripOnMouseUp),e.target.parentElement.style.cursor="default",l.digest(n),n.isColumnResizing=!1,!1},c.copy=function(){var t=new C(e,n,o,l,a);return t.isClone=!0,t.orig=c,t},c.setVars=function(e){c.orig=e,c.width=e.width,c.groupIndex=e.groupIndex,c.isGroupedBy=e.isGroupedBy,c.displayName=e.displayName,c.index=e.index,c.isAggCol=e.isAggCol,c.cellClass=e.cellClass,c.cellFilter=e.cellFilter,c.field=e.field,c.aggLabelFilter=e.aggLabelFilter,c.visible=e.visible,c.sortable=e.sortable,c.resizable=e.resizable,c.pinnable=e.pinnable,c.pinned=e.pinned,c.originalIndex=e.originalIndex,c.sortDirection=e.sortDirection,c.sortingAlgorithm=e.sortingAlgorithm,c.headerClass=e.headerClass,c.headerCellTemplate=e.headerCellTemplate,c.cellTemplate=e.cellTemplate,c.cellEditTemplate=e.cellEditTemplate}},b=function(e){this.outerHeight=null,this.outerWidth=null,t.extend(this,e)},S=function(e){this.previousColumn=null,this.grid=e};S.prototype.changeUserSelect=function(e,t){e.css({"-webkit-touch-callout":t,"-webkit-user-select":t,"-khtml-user-select":t,"-moz-user-select":"none"===t?"-moz-none":t,"-ms-user-select":t,"user-select":t})},S.prototype.focusCellElement=function(e,t){if(e.selectionProvider.lastClickedRow){var n=void 0!==t?t:this.previousColumn,o=e.selectionProvider.lastClickedRow.clone?e.selectionProvider.lastClickedRow.clone.elm:e.selectionProvider.lastClickedRow.elm;if(void 0!==n&&o){var i=angular.element(o[0].children).filter(function(){return 8!==this.nodeType}),r=Math.max(Math.min(e.renderedColumns.length-1,n),0);this.grid.config.showSelectionCheckbox&&angular.element(i[r]).scope()&&0===angular.element(i[r]).scope().col.index&&(r=1),i[r]&&i[r].children[1].children[0].focus(),this.previousColumn=n}}},S.prototype.selectionHandlers=function(e,t){var n=!1,o=this;t.bind("keydown",function(i){if(16===i.keyCode)return o.changeUserSelect(t,"none",i),!0;if(!n){n=!0;var r=v(e,t,i,o.grid);return n=!1,r}return!0}),t.bind("keyup",function(e){return 16===e.keyCode&&o.changeUserSelect(t,"text",e),!0})};var x=function(n,o,i,r){var l=this;l.colToMove=void 0,l.groupToMove=void 0,l.assignEvents=function(){n.config.jqueryUIDraggable&&!n.config.enablePinning?n.$groupPanel.droppable({addClasses:!1,drop:function(e){l.onGroupDrop(e)}}):(n.$groupPanel.on("mousedown",l.onGroupMouseDown).on("dragover",l.dragOver).on("drop",l.onGroupDrop),n.$headerScroller.on("mousedown",l.onHeaderMouseDown).on("dragover",l.dragOver),n.config.enableColumnReordering&&!n.config.enablePinning&&n.$headerScroller.on("drop",l.onHeaderDrop)),o.$watch("renderedColumns",function(){r(l.setDraggables)})},l.dragStart=function(e){e.dataTransfer.setData("text","")},l.dragOver=function(e){e.preventDefault()},l.setDraggables=function(){if(n.config.jqueryUIDraggable)n.$root.find(".ngHeaderSortColumn").draggable({helper:"clone",appendTo:"body",stack:"div",addClasses:!1,start:function(e){l.onHeaderMouseDown(e)}}).droppable({drop:function(e){l.onHeaderDrop(e)}});else{var e=n.$root.find(".ngHeaderSortColumn");angular.forEach(e,function(e){e.className&&-1!==e.className.indexOf("ngHeaderSortColumn")&&(e.setAttribute("draggable","true"),e.addEventListener&&e.addEventListener("dragstart",l.dragStart))}),-1!==navigator.userAgent.indexOf("MSIE")&&n.$root.find(".ngHeaderSortColumn").bind("selectstart",function(){return this.dragDrop(),!1})}},l.onGroupMouseDown=function(e){var o=t(e.target);if("ngRemoveGroup"!==o[0].className){var i=angular.element(o).scope();i&&(n.config.jqueryUIDraggable||(o.attr("draggable","true"),this.addEventListener&&this.addEventListener("dragstart",l.dragStart),-1!==navigator.userAgent.indexOf("MSIE")&&o.bind("selectstart",function(){return this.dragDrop(),!1})),l.groupToMove={header:o,groupName:i.group,index:i.$index})}else l.groupToMove=void 0},l.onGroupDrop=function(e){e.stopPropagation();var i,r;l.groupToMove?(i=t(e.target).closest(".ngGroupElement"),"ngGroupPanel"===i.context.className?(o.configGroups.splice(l.groupToMove.index,1),o.configGroups.push(l.groupToMove.groupName)):(r=angular.element(i).scope(),r&&l.groupToMove.index!==r.$index&&(o.configGroups.splice(l.groupToMove.index,1),o.configGroups.splice(r.$index,0,l.groupToMove.groupName))),l.groupToMove=void 0,n.fixGroupIndexes()):l.colToMove&&(-1===o.configGroups.indexOf(l.colToMove.col)&&(i=t(e.target).closest(".ngGroupElement"),"ngGroupPanel"===i.context.className||"ngGroupPanelDescription ng-binding"===i.context.className?o.groupBy(l.colToMove.col):(r=angular.element(i).scope(),r&&o.removeGroup(r.$index))),l.colToMove=void 0),o.$$phase||o.$apply()},l.onHeaderMouseDown=function(e){var n=t(e.target).closest(".ngHeaderSortColumn"),o=angular.element(n).scope();o&&(l.colToMove={header:n,col:o.col})},l.onHeaderDrop=function(e){if(l.colToMove&&!l.colToMove.col.pinned){var r=t(e.target).closest(".ngHeaderSortColumn"),a=angular.element(r).scope();if(a){if(l.colToMove.col===a.col)return;o.columns.splice(l.colToMove.col.index,1),o.columns.splice(a.col.index,0,l.colToMove.col),n.fixColumnIndexes(),l.colToMove=void 0,i.digest(o)}}},l.assignGridEventHandlers=function(){-1===n.config.tabIndex?(n.$viewport.attr("tabIndex",i.numberOfGrids),i.numberOfGrids++):n.$viewport.attr("tabIndex",n.config.tabIndex);var r;t(e).resize(function(){clearTimeout(r),r=setTimeout(function(){i.RebuildGrid(o,n)},100)});var l;t(n.$root.parent()).on("resize",function(){clearTimeout(l),l=setTimeout(function(){i.RebuildGrid(o,n)},100)})},l.assignGridEventHandlers(),l.assignEvents()},y=function(e,t){e.maxRows=function(){var n=Math.max(e.totalServerItems,t.data.length);return n},e.multiSelect=t.config.enableRowSelection&&t.config.multiSelect,e.selectedItemCount=t.selectedItemCount,e.maxPages=function(){return Math.ceil(e.maxRows()/e.pagingOptions.pageSize)},e.pageForward=function(){var t=e.pagingOptions.currentPage;e.totalServerItems>0?e.pagingOptions.currentPage=Math.min(t+1,e.maxPages()):e.pagingOptions.currentPage++},e.pageBackward=function(){var t=e.pagingOptions.currentPage;e.pagingOptions.currentPage=Math.max(t-1,1)},e.pageToFirst=function(){e.pagingOptions.currentPage=1},e.pageToLast=function(){var t=e.maxPages();e.pagingOptions.currentPage=t},e.cantPageForward=function(){var n=e.pagingOptions.currentPage,o=e.maxPages();return e.totalServerItems>0?n>=o:1>t.data.length},e.cantPageToLast=function(){return e.totalServerItems>0?e.cantPageForward():!0},e.cantPageBackward=function(){var t=e.pagingOptions.currentPage;return 1>=t}},T=function(i,r,l,a,c,g,d,u,f,p,m){var v={aggregateTemplate:void 0,afterSelectionChange:function(){},beforeSelectionChange:function(){return!0},checkboxCellTemplate:void 0,checkboxHeaderTemplate:void 0,columnDefs:void 0,data:[],dataUpdated:function(){},enableCellEdit:!1,enableCellEditOnFocus:!1,enableCellSelection:!1,enableColumnResize:!1,enableColumnReordering:!1,enableColumnHeavyVirt:!1,enablePaging:!1,enablePinning:!1,enableRowSelection:!0,enableSorting:!0,enableHighlighting:!1,excludeProperties:[],filterOptions:{filterText:"",useExternalFilter:!1},footerRowHeight:55,footerTemplate:void 0,groups:[],groupsCollapsedByDefault:!0,headerRowHeight:30,headerRowTemplate:void 0,jqueryUIDraggable:!1,jqueryUITheme:!1,keepLastSelected:!0,maintainColumnRatios:void 0,menuTemplate:void 0,multiSelect:!0,pagingOptions:{pageSizes:[250,500,1e3],pageSize:250,currentPage:1},pinSelectionCheckbox:!1,plugins:[],primaryKey:void 0,rowHeight:30,rowTemplate:void 0,selectedItems:[],selectWithCheckboxOnly:!1,showColumnMenu:!1,showFilter:!1,showFooter:!1,showGroupPanel:!1,showSelectionCheckbox:!1,sortInfo:{fields:[],columns:[],directions:[]},tabIndex:-1,totalServerItems:0,useExternalSorting:!1,i18n:"en",virtualizationThreshold:50},w=this;w.maxCanvasHt=0,w.config=t.extend(v,e.ngGrid.config,r),w.config.showSelectionCheckbox=w.config.showSelectionCheckbox&&w.config.enableColumnHeavyVirt===!1,w.config.enablePinning=w.config.enablePinning&&w.config.enableColumnHeavyVirt===!1,w.config.selectWithCheckboxOnly=w.config.selectWithCheckboxOnly&&w.config.showSelectionCheckbox!==!1,w.config.pinSelectionCheckbox=w.config.enablePinning,"string"==typeof r.columnDefs&&(w.config.columnDefs=i.$eval(r.columnDefs)),w.rowCache=[],w.rowMap=[],w.gridId="ng"+d.newId(),w.$root=null,w.$groupPanel=null,w.$topPanel=null,w.$headerContainer=null,w.$headerScroller=null,w.$headers=null,w.$viewport=null,w.$canvas=null,w.rootDim=w.config.gridDim,w.data=[],w.lateBindColumns=!1,w.filteredRows=[],w.initTemplates=function(){var e=["rowTemplate","aggregateTemplate","headerRowTemplate","checkboxCellTemplate","checkboxHeaderTemplate","menuTemplate","footerTemplate"],t=[];return angular.forEach(e,function(e){t.push(w.getTemplate(e))}),m.all(t)},w.getTemplate=function(e){var t=w.config[e],n=w.gridId+e+".html",o=m.defer();if(t&&!h.test(t))p.get(t,{cache:g}).success(function(e){g.put(n,e),o.resolve()}).error(function(){o.reject("Could not load template: "+t)});else if(t)g.put(n,t),o.resolve();else{var i=e+".html";g.put(n,g.get(i)),o.resolve()}return o.promise},"object"==typeof w.config.data&&(w.data=w.config.data),w.calcMaxCanvasHeight=function(){var e;return e=w.config.groups.length>0?w.rowFactory.parsedData.filter(function(e){return!e[s]}).length*w.config.rowHeight:w.filteredRows.length*w.config.rowHeight},w.elementDims={scrollW:0,scrollH:0,rowIndexCellW:25,rowSelectedCellW:25,rootMaxW:0,rootMaxH:0},w.setRenderedRows=function(e){i.renderedRows.length=e.length;for(var t=0;e.length>t;t++)!i.renderedRows[t]||e[t].isAggRow||i.renderedRows[t].isAggRow?(i.renderedRows[t]=e[t].copy(),i.renderedRows[t].collapsed=e[t].collapsed,e[t].isAggRow||i.renderedRows[t].setVars(e[t])):i.renderedRows[t].setVars(e[t]),i.renderedRows[t].rowIndex=e[t].rowIndex,i.renderedRows[t].offsetTop=e[t].offsetTop,i.renderedRows[t].selected=e[t].selected,e[t].renderedRowIndex=t;w.refreshDomSizes(),i.$emit("ngGridEventRows",e)},w.minRowsToRender=function(){var e=i.viewportDimHeight()||1;return Math.floor(e/w.config.rowHeight)},w.refreshDomSizes=function(){var e=new b;e.outerWidth=w.elementDims.rootMaxW,e.outerHeight=w.elementDims.rootMaxH,w.rootDim=e,w.maxCanvasHt=w.calcMaxCanvasHeight()},w.buildColumnDefsFromData=function(){w.config.columnDefs=[];var e=w.data[0];return e?(d.forIn(e,function(e,t){-1===w.config.excludeProperties.indexOf(t)&&w.config.columnDefs.push({field:t})}),void 0):(w.lateBoundColumns=!0,void 0)},w.buildColumns=function(){var e=w.config.columnDefs,t=[];if(e||(w.buildColumnDefsFromData(),e=w.config.columnDefs),w.config.showSelectionCheckbox&&t.push(new C({colDef:{field:"✔",width:w.elementDims.rowSelectedCellW,sortable:!1,resizable:!1,groupable:!1,headerCellTemplate:g.get(i.gridId+"checkboxHeaderTemplate.html"),cellTemplate:g.get(i.gridId+"checkboxCellTemplate.html"),pinned:w.config.pinSelectionCheckbox},index:0,headerRowHeight:w.config.headerRowHeight,sortCallback:w.sortData,resizeOnDataCallback:w.resizeOnData,enableResize:w.config.enableColumnResize,enableSort:w.config.enableSorting,enablePinning:w.config.enablePinning},i,w,a,g,d)),e.length>0){var n=w.config.showSelectionCheckbox?1:0,o=i.configGroups.length;i.configGroups.length=0,angular.forEach(e,function(e,r){r+=n;var l=new C({colDef:e,index:r+o,originalIndex:r,headerRowHeight:w.config.headerRowHeight,sortCallback:w.sortData,resizeOnDataCallback:w.resizeOnData,enableResize:w.config.enableColumnResize,enableSort:w.config.enableSorting,enablePinning:w.config.enablePinning,enableCellEdit:w.config.enableCellEdit||w.config.enableCellEditOnFocus},i,w,a,g,d),s=w.config.groups.indexOf(e.field);-1!==s&&(l.isGroupedBy=!0,i.configGroups.splice(s,0,l),l.groupIndex=i.configGroups.length),t.push(l)}),i.columns=t,i.configGroups.length>0&&w.rowFactory.getGrouping(i.configGroups)}},w.configureColumnWidths=function(){var e=[],t=[],n=0,o=0,r={};if(angular.forEach(i.columns,function(e,t){if(!d.isNullOrUndefined(e.originalIndex)){var n=e.originalIndex;w.config.showSelectionCheckbox&&(0===e.originalIndex&&e.visible&&(o+=25),n--),r[n]=t}}),angular.forEach(w.config.columnDefs,function(l,a){var s=i.columns[r[a]];l.index=a;var c,g=!1;if(d.isNullOrUndefined(l.width)?l.width="*":(g=isNaN(l.width)?d.endsWith(l.width,"%"):!1,c=g?l.width:parseInt(l.width,10)),isNaN(c)&&!i.hasUserChangedGridColumnWidths){if(c=l.width,"auto"===c){s.width=s.minWidth,o+=s.width;var u=s;return i.$on("ngGridEventData",function(){w.resizeOnData(u)}),void 0}if(-1!==c.indexOf("*"))return s.visible!==!1&&(n+=c.length),e.push(l),void 0;if(g)return t.push(l),void 0;throw'unable to parse column width, use percentage ("10%","20%", etc...) or "*" to use remaining width of grid'}s.visible!==!1&&(o+=s.width=parseInt(s.width,10))}),t.length>0){w.config.maintainColumnRatios=w.config.maintainColumnRatios!==!1;var l=0,s=0;angular.forEach(t,function(e){var t=i.columns[r[e.index]],n=e.width,o=parseInt(n.slice(0,-1),10)/100;l+=o,t.visible||(s+=o)});var c=l-s;angular.forEach(t,function(e){var t=i.columns[r[e.index]],n=e.width,a=parseInt(n.slice(0,-1),10)/100;a/=s>0?c:l;var g=w.rootDim.outerWidth*l;t.width=Math.floor(g*a),o+=t.width})}if(e.length>0){w.config.maintainColumnRatios=w.config.maintainColumnRatios!==!1;var g=w.rootDim.outerWidth-o;w.maxCanvasHt>i.viewportDimHeight()&&(g-=a.ScrollW);var u=Math.floor(g/n);angular.forEach(e,function(t,n){var l=i.columns[r[t.index]];l.width=u*t.width.length,l.visible!==!1&&(o+=l.width);var s=n===e.length-1;if(s&&w.rootDim.outerWidth>o){var c=w.rootDim.outerWidth-o;w.maxCanvasHt>i.viewportDimHeight()&&(c-=a.ScrollW),l.width+=c}})}},w.init=function(){return w.initTemplates().then(function(){i.selectionProvider=new D(w,i,f),i.domAccessProvider=new S(w),w.rowFactory=new R(w,i,a,g,d),w.searchProvider=new $(i,w,c),w.styleProvider=new G(i,w),i.$watch("configGroups",function(e){var t=[];angular.forEach(e,function(e){t.push(e.field||e)}),w.config.groups=t,w.rowFactory.filteredRowsChanged(),i.$emit("ngGridEventGroups",e)},!0),i.$watch("columns",function(e){i.isColumnResizing||a.RebuildGrid(i,w),i.$emit("ngGridEventColumns",e)},!0),i.$watch(function(){return r.i18n},function(e){d.seti18n(i,e)}),w.maxCanvasHt=w.calcMaxCanvasHeight(),w.config.sortInfo.fields&&w.config.sortInfo.fields.length>0&&i.$watch(function(){return w.config.sortInfo},function(){l.isSorting||(w.sortColumnsInit(),i.$emit("ngGridEventSorted",w.config.sortInfo))},!0)})},w.resizeOnData=function(e){var n=e.minWidth,o=d.getElementsByClassName("col"+e.index);angular.forEach(o,function(e,o){var i;if(0===o){var r=t(e).find(".ngHeaderText");i=d.visualLength(r)+10}else{var l=t(e).find(".ngCellText");i=d.visualLength(l)+10}i>n&&(n=i)}),e.width=e.longest=Math.min(e.maxWidth,n+7),a.BuildStyles(i,w,!0)},w.lastSortedColumns=[],w.sortData=function(e,n){if(n&&n.shiftKey&&w.config.sortInfo){var o=w.config.sortInfo.columns.indexOf(e);-1===o?(1===w.config.sortInfo.columns.length&&(w.config.sortInfo.columns[0].sortPriority=1),w.config.sortInfo.columns.push(e),e.sortPriority=w.config.sortInfo.columns.length,w.config.sortInfo.fields.push(e.field),w.config.sortInfo.directions.push(e.sortDirection),w.lastSortedColumns.push(e)):w.config.sortInfo.directions[o]=e.sortDirection}else{var r=t.isArray(e);w.config.sortInfo.columns.length=0,w.config.sortInfo.fields.length=0,w.config.sortInfo.directions.length=0;var l=function(e){w.config.sortInfo.columns.push(e),w.config.sortInfo.fields.push(e.field),w.config.sortInfo.directions.push(e.sortDirection),w.lastSortedColumns.push(e)};r?(w.clearSortingData(),angular.forEach(e,function(e,t){e.sortPriority=t+1,l(e)})):(w.clearSortingData(e),e.sortPriority=void 0,l(e))}w.sortActual(),w.searchProvider.evalFilter(),i.$emit("ngGridEventSorted",w.config.sortInfo)},w.sortColumnsInit=function(){w.config.sortInfo.columns?w.config.sortInfo.columns.length=0:w.config.sortInfo.columns=[],angular.forEach(i.columns,function(e){var t=w.config.sortInfo.fields.indexOf(e.field);-1!==t&&(e.sortDirection=w.config.sortInfo.directions[t]||"asc",w.config.sortInfo.columns[t]=e)}),angular.forEach(w.config.sortInfo.columns,function(e){w.sortData(e)})},w.sortActual=function(){if(!w.config.useExternalSorting){var e=w.data.slice(0);angular.forEach(e,function(e,t){var n=w.rowMap[t];if(void 0!==n){var o=w.rowCache[n];void 0!==o&&(e.preSortSelected=o.selected,e.preSortIndex=t)}}),l.Sort(w.config.sortInfo,e),angular.forEach(e,function(e,t){w.rowCache[t].entity=e,w.rowCache[t].selected=e.preSortSelected,w.rowMap[e.preSortIndex]=t,delete e.preSortSelected,delete e.preSortIndex})}},w.clearSortingData=function(e){e?(angular.forEach(w.lastSortedColumns,function(t){e.index!==t.index&&(t.sortDirection="",t.sortPriority=null)}),w.lastSortedColumns[0]=e,w.lastSortedColumns.length=1):(angular.forEach(w.lastSortedColumns,function(e){e.sortDirection="",e.sortPriority=null}),w.lastSortedColumns=[])},w.fixColumnIndexes=function(){for(var e=0;i.columns.length>e;e++)i.columns[e].index=e},w.fixGroupIndexes=function(){angular.forEach(i.configGroups,function(e,t){e.groupIndex=t+1})},i.elementsNeedMeasuring=!0,i.columns=[],i.renderedRows=[],i.renderedColumns=[],i.headerRow=null,i.rowHeight=w.config.rowHeight,i.jqueryUITheme=w.config.jqueryUITheme,i.showSelectionCheckbox=w.config.showSelectionCheckbox,i.enableCellSelection=w.config.enableCellSelection,i.enableCellEditOnFocus=w.config.enableCellEditOnFocus,i.footer=null,i.selectedItems=w.config.selectedItems,i.multiSelect=w.config.multiSelect,i.showFooter=w.config.showFooter,i.footerRowHeight=i.showFooter?w.config.footerRowHeight:0,i.showColumnMenu=w.config.showColumnMenu,i.showMenu=!1,i.configGroups=[],i.gridId=w.gridId,i.enablePaging=w.config.enablePaging,i.pagingOptions=w.config.pagingOptions,i.i18n={},d.seti18n(i,w.config.i18n),i.adjustScrollLeft=function(e){for(var t=0,n=0,o=i.columns.length,r=[],l=!w.config.enableColumnHeavyVirt,s=0,c=function(e){l?r.push(e):i.renderedColumns[s]?i.renderedColumns[s].setVars(e):i.renderedColumns[s]=e.copy(),s++},g=0;o>g;g++){var d=i.columns[g];if(d.visible!==!1){var u=d.width+t;if(d.pinned){c(d);var f=g>0?e+n:e;a.setColLeft(d,f,w),n+=d.width}else u>=e&&e+w.rootDim.outerWidth>=t&&c(d);t+=d.width}}l&&(i.renderedColumns=r)},w.prevScrollTop=0,w.prevScrollIndex=0,i.adjustScrollTop=function(e,t){if(w.prevScrollTop!==e||t){e>0&&w.$viewport[0].scrollHeight-e<=w.$viewport.outerHeight()&&i.$emit("ngGridEventScroll"); var r,l=Math.floor(e/w.config.rowHeight);if(w.filteredRows.length>w.config.virtualizationThreshold){if(e>w.prevScrollTop&&w.prevScrollIndex+o>l)return;if(w.prevScrollTop>e&&l>w.prevScrollIndex-o)return;r=new P(Math.max(0,l-n),l+w.minRowsToRender()+n)}else{var a=i.configGroups.length>0?w.rowFactory.parsedData.length:w.data.length;r=new P(0,Math.max(a,w.minRowsToRender()+n))}w.prevScrollTop=e,w.rowFactory.UpdateViewableRange(r),w.prevScrollIndex=l}},i.toggleShowMenu=function(){i.showMenu=!i.showMenu},i.toggleSelectAll=function(e,t){i.selectionProvider.toggleSelectAll(e,!1,t)},i.totalFilteredItemsLength=function(){return w.filteredRows.length},i.showGroupPanel=function(){return w.config.showGroupPanel},i.topPanelHeight=function(){return w.config.showGroupPanel===!0?w.config.headerRowHeight+32:w.config.headerRowHeight},i.viewportDimHeight=function(){return Math.max(0,w.rootDim.outerHeight-i.topPanelHeight()-i.footerRowHeight-2)},i.groupBy=function(e){if(!(1>w.data.length)&&e.groupable&&e.field){e.sortDirection||e.sort({shiftKey:i.configGroups.length>0?!0:!1});var t=i.configGroups.indexOf(e);-1===t?(e.isGroupedBy=!0,i.configGroups.push(e),e.groupIndex=i.configGroups.length):i.removeGroup(t),w.$viewport.scrollTop(0),a.digest(i)}},i.removeGroup=function(e){var t=i.columns.filter(function(t){return t.groupIndex===e+1})[0];t.isGroupedBy=!1,t.groupIndex=0,i.columns[e].isAggCol&&(i.columns.splice(e,1),i.configGroups.splice(e,1),w.fixGroupIndexes()),0===i.configGroups.length&&(w.fixColumnIndexes(),a.digest(i)),i.adjustScrollLeft(0)},i.togglePin=function(e){for(var t=e.index,n=0,o=0;i.columns.length>o&&i.columns[o].pinned;o++)n++;e.pinned&&(n=Math.max(e.originalIndex,n-1)),e.pinned=!e.pinned,i.columns.splice(t,1),i.columns.splice(n,0,e),w.fixColumnIndexes(),a.BuildStyles(i,w,!0),w.$viewport.scrollLeft(w.$viewport.scrollLeft()-e.width)},i.totalRowWidth=function(){for(var e=0,t=i.columns,n=0;t.length>n;n++)t[n].visible!==!1&&(e+=t[n].width);return e},i.headerScrollerDim=function(){var e=i.viewportDimHeight(),t=w.maxCanvasHt,n=t>e,o=new b;return o.autoFitHeight=!0,o.outerWidth=i.totalRowWidth(),n?o.outerWidth+=w.elementDims.scrollW:w.elementDims.scrollH>=t-e&&(o.outerWidth+=w.elementDims.scrollW),o}},P=function(e,t){this.topRow=e,this.bottomRow=t},I=function(e,t,n,o,i){this.entity=e,this.config=t,this.selectionProvider=n,this.rowIndex=o,this.utils=i,this.selected=n.getSelection(e),this.cursor=this.config.enableRowSelection?"pointer":"default",this.beforeSelectionChange=t.beforeSelectionChangeCallback,this.afterSelectionChange=t.afterSelectionChangeCallback,this.offsetTop=this.rowIndex*t.rowHeight,this.rowDisplayIndex=0};I.prototype.setSelection=function(e){this.selectionProvider.setSelection(this,e),this.selectionProvider.lastClickedRow=this},I.prototype.continueSelection=function(e){this.selectionProvider.ChangeSelection(this,e)},I.prototype.ensureEntity=function(e){this.entity!==e&&(this.entity=e,this.selected=this.selectionProvider.getSelection(this.entity))},I.prototype.toggleSelected=function(e){if(!this.config.enableRowSelection&&!this.config.enableCellSelection)return!0;var t=e.target||e;return"checkbox"===t.type&&"ngSelectionCell ng-scope"!==t.parentElement.className?!0:this.config.selectWithCheckboxOnly&&"checkbox"!==t.type?(this.selectionProvider.lastClickedRow=this,!0):(this.beforeSelectionChange(this,e)&&this.continueSelection(e),!1)},I.prototype.alternatingRowClass=function(){var e=0===this.rowIndex%2,t={ngRow:!0,selected:this.selected,even:e,odd:!e,"ui-state-default":this.config.jqueryUITheme&&e,"ui-state-active":this.config.jqueryUITheme&&!e};return t},I.prototype.getProperty=function(e){return this.utils.evalProperty(this.entity,e)},I.prototype.copy=function(){return this.clone=new I(this.entity,this.config,this.selectionProvider,this.rowIndex,this.utils),this.clone.isClone=!0,this.clone.elm=this.elm,this.clone.orig=this,this.clone},I.prototype.setVars=function(e){e.clone=this,this.entity=e.entity,this.selected=e.selected,this.orig=e};var R=function(e,t,o,i,r){var g=this;g.aggCache={},g.parentCache=[],g.dataChanged=!0,g.parsedData=[],g.rowConfig={},g.selectionProvider=t.selectionProvider,g.rowHeight=30,g.numberOfAggregates=0,g.groupedData=void 0,g.rowHeight=e.config.rowHeight,g.rowConfig={enableRowSelection:e.config.enableRowSelection,rowClasses:e.config.rowClasses,selectedItems:t.selectedItems,selectWithCheckboxOnly:e.config.selectWithCheckboxOnly,beforeSelectionChangeCallback:e.config.beforeSelectionChange,afterSelectionChangeCallback:e.config.afterSelectionChange,jqueryUITheme:e.config.jqueryUITheme,enableCellSelection:e.config.enableCellSelection,rowHeight:e.config.rowHeight},g.renderedRange=new P(0,e.minRowsToRender()+n),g.buildEntityRow=function(e,t){return new I(e,g.rowConfig,g.selectionProvider,t,r)},g.buildAggregateRow=function(t,n){var o=g.aggCache[t.aggIndex];return o||(o=new w(t,g,g.rowConfig.rowHeight,e.config.groupsCollapsedByDefault),g.aggCache[t.aggIndex]=o),o.rowIndex=n,o.offsetTop=n*g.rowConfig.rowHeight,o},g.UpdateViewableRange=function(e){g.renderedRange=e,g.renderedChange()},g.filteredRowsChanged=function(){e.lateBoundColumns&&e.filteredRows.length>0&&(e.config.columnDefs=void 0,e.buildColumns(),e.lateBoundColumns=!1,t.$evalAsync(function(){t.adjustScrollLeft(0)})),g.dataChanged=!0,e.config.groups.length>0&&g.getGrouping(e.config.groups),g.UpdateViewableRange(g.renderedRange)},g.renderedChange=function(){if(!g.groupedData||1>e.config.groups.length)return g.renderedChangeNoGroups(),e.refreshDomSizes(),void 0;g.wasGrouped=!0,g.parentCache=[];var t=0,n=g.parsedData.filter(function(e){return e.isAggRow?e.parent&&e.parent.collapsed?!1:!0:(e[s]||(e.rowIndex=t++),!e[s])});g.totalRows=n.length;for(var o=[],i=g.renderedRange.topRow;g.renderedRange.bottomRow>i;i++)n[i]&&(n[i].offsetTop=i*e.config.rowHeight,o.push(n[i]));e.setRenderedRows(o)},g.renderedChangeNoGroups=function(){for(var t=[],n=g.renderedRange.topRow;g.renderedRange.bottomRow>n;n++)e.filteredRows[n]&&(e.filteredRows[n].rowIndex=n,e.filteredRows[n].offsetTop=n*e.config.rowHeight,t.push(e.filteredRows[n]));e.setRenderedRows(t)},g.fixRowCache=function(){var t=e.data.length,n=t-e.rowCache.length;if(0>n)e.rowCache.length=e.rowMap.length=t;else for(var o=e.rowCache.length;t>o;o++)e.rowCache[o]=e.rowFactory.buildEntityRow(e.data[o],o)},g.parseGroupData=function(e){if(e.values)for(var t=0;e.values.length>t;t++)g.parentCache[g.parentCache.length-1].children.push(e.values[t]),g.parsedData.push(e.values[t]);else for(var n in e)if(n!==l&&n!==a&&n!==c&&e.hasOwnProperty(n)){var o=g.buildAggregateRow({gField:e[l],gLabel:n,gDepth:e[a],isAggRow:!0,_ng_hidden_:!1,children:[],aggChildren:[],aggIndex:g.numberOfAggregates,aggLabelFilter:e[c].aggLabelFilter},0);g.numberOfAggregates++,o.parent=g.parentCache[o.depth-1],o.parent&&(o.parent.collapsed=!1,o.parent.aggChildren.push(o)),g.parsedData.push(o),g.parentCache[o.depth]=o,g.parseGroupData(e[n])}},g.getGrouping=function(n){function d(e,t){return e.filter(function(e){return e.field===t})}g.aggCache=[],g.numberOfAggregates=0,g.groupedData={};for(var u=e.filteredRows,f=n.length,h=t.columns,p=0;u.length>p;p++){var m=u[p].entity;if(!m)return;u[p][s]=e.config.groupsCollapsedByDefault;for(var v=g.groupedData,w=0;n.length>w;w++){var b=n[w],S=d(h,b)[0],x=r.evalProperty(m,b);x=x?""+x:"null",v[x]||(v[x]={}),v[l]||(v[l]=b),v[a]||(v[a]=w),v[c]||(v[c]=S),v=v[x]}v.values||(v.values=[]),v.values.push(u[p])}for(var y=0;n.length>y;y++)!h[y].isAggCol&&f>=y&&h.splice(0,0,new C({colDef:{field:"",width:25,sortable:!1,resizable:!1,headerCellTemplate:'<div class="ngAggHeader"></div>',pinned:e.config.pinSelectionCheckbox},enablePinning:e.config.enablePinning,isAggCol:!0,headerRowHeight:e.config.headerRowHeight},t,e,o,i,r));e.fixColumnIndexes(),t.adjustScrollLeft(0),g.parsedData.length=0,g.parseGroupData(g.groupedData),g.fixRowCache()},e.config.groups.length>0&&e.filteredRows.length>0&&g.getGrouping(e.config.groups)},$=function(e,n,o){var i=this,r=[];i.extFilter=n.config.filterOptions.useExternalFilter,e.showFilter=n.config.showFilter,e.filterText="",i.fieldMap={},i.evalFilter=function(){var e=function(e){for(var t=0,n=r.length;n>t;t++){var a,s=r[t];if(!s.column){for(var c in e)if(e.hasOwnProperty(c)){var g=i.fieldMap[c.toLowerCase()];if(!g)continue;var d=null,u=null;g&&g.cellFilter&&(u=g.cellFilter.split(":"),d=o(u[0]));var f=e[c];if(null!==f&&void 0!==f){if("function"==typeof d){var h=""+d("object"==typeof f?l(f,g.field):f,u[1]);a=s.regex.test(h)}else a=s.regex.test("object"==typeof f?""+l(f,g.field):""+f);if(a)return!0}}return!1}var p=i.fieldMap[s.columnDisplay];if(!p)return!1;var m=p.cellFilter.split(":"),v=p.cellFilter?o(m[0]):null,w=e[s.column]||e[p.field.split(".")[0]];if(null===w||void 0===w)return!1;if("function"==typeof v){var C=""+v("object"==typeof w?l(w,p.field):w,m[1]);a=s.regex.test(C)}else a=s.regex.test("object"==typeof w?""+l(w,p.field):""+w);if(!a)return!1}return!0};n.filteredRows=0===r.length?n.rowCache:n.rowCache.filter(function(t){return e(t.entity)});for(var t=0;n.filteredRows.length>t;t++)n.filteredRows[t].rowIndex=t;n.rowFactory.filteredRowsChanged()};var l=function(e,t){if("object"!=typeof e||"string"!=typeof t)return e;var n=t.split("."),o=e;if(n.length>1){for(var i=1,r=n.length;r>i;i++)if(o=o[n[i]],!o)return e;return o}return e},a=function(e,t){try{return RegExp(e,t)}catch(n){return RegExp(e.replace(/(\^|\$|$|$|<|>|\[|\]|\{|\}|\\|\||\.|\*|\+|\?)/g,"\\$1"))}},s=function(e){r=[];var n;if(n=t.trim(e))for(var o=n.split(";"),i=0;o.length>i;i++){var l=o[i].split(":");if(l.length>1){var s=t.trim(l[0]),c=t.trim(l[1]);s&&c&&r.push({column:s,columnDisplay:s.replace(/\s+/g,"").toLowerCase(),regex:a(c,"i")})}else{var g=t.trim(l[0]);g&&r.push({column:"",regex:a(g,"i")})}}};i.extFilter||e.$watch("columns",function(e){for(var t=0;e.length>t;t++){var n=e[t];n.field&&(i.fieldMap[n.field.split(".")[0].toLowerCase()]=n),n.displayName&&(i.fieldMap[n.displayName.toLowerCase().replace(/\s+/g,"")]=n)}}),e.$watch(function(){return n.config.filterOptions.filterText},function(t){e.filterText=t}),e.$watch("filterText",function(t){i.extFilter||(e.$emit("ngGridEventFilter",t),s(t),i.evalFilter())})},D=function(e,t,n){var o=this;o.multi=e.config.multiSelect,o.selectedItems=e.config.selectedItems,o.selectedIndex=e.config.selectedIndex,o.lastClickedRow=void 0,o.ignoreSelectedItemChanges=!1,o.pKeyParser=n(e.config.primaryKey),o.ChangeSelection=function(n,i){var r=i.which||i.keyCode,l=40===r||38===r;if(i&&i.shiftKey&&!i.keyCode&&o.multi&&e.config.enableRowSelection){if(o.lastClickedRow){var a;a=t.configGroups.length>0?e.rowFactory.parsedData.filter(function(e){return!e.isAggRow}):e.filteredRows;var s=n.rowIndex,c=o.lastClickedRowIndex;if(s===c)return!1;c>s?(s^=c,c=s^c,s^=c,s--):c++;for(var g=[];s>=c;c++)g.push(a[c]);if(g[g.length-1].beforeSelectionChange(g,i)){for(var d=0;g.length>d;d++){var u=g[d],f=u.selected;u.selected=!f,u.clone&&(u.clone.selected=u.selected);var h=o.selectedItems.indexOf(u.entity);-1===h?o.selectedItems.push(u.entity):o.selectedItems.splice(h,1)}g[g.length-1].afterSelectionChange(g,i)}return o.lastClickedRow=n,o.lastClickedRowIndex=n.rowIndex,!0}}else o.multi?(!i.keyCode||l&&!e.config.selectWithCheckboxOnly)&&o.setSelection(n,!n.selected):o.lastClickedRow===n?o.setSelection(o.lastClickedRow,e.config.keepLastSelected?!0:!n.selected):(o.lastClickedRow&&o.setSelection(o.lastClickedRow,!1),o.setSelection(n,!n.selected));return o.lastClickedRow=n,o.lastClickedRowIndex=n.rowIndex,!0},o.getSelection=function(t){var n=!1;if(e.config.primaryKey){var i=o.pKeyParser(t);angular.forEach(o.selectedItems,function(e){i===o.pKeyParser(e)&&(n=!0)})}else n=-1!==o.selectedItems.indexOf(t);return n},o.setSelection=function(t,n){if(e.config.enableRowSelection){if(n)-1===o.selectedItems.indexOf(t.entity)&&(!o.multi&&o.selectedItems.length>0&&o.toggleSelectAll(!1,!0),o.selectedItems.push(t.entity));else{var i=o.selectedItems.indexOf(t.entity);-1!==i&&o.selectedItems.splice(i,1)}t.selected=n,t.orig&&(t.orig.selected=n),t.clone&&(t.clone.selected=n),t.afterSelectionChange(t)}},o.toggleSelectAll=function(t,n,i){var r=i?e.filteredRows:e.rowCache;if(n||e.config.beforeSelectionChange(r,t)){var l=o.selectedItems.length;l>0&&(o.selectedItems.length=0);for(var a=0;r.length>a;a++)r[a].selected=t,r[a].clone&&(r[a].clone.selected=t),t&&o.selectedItems.push(r[a].entity);n||e.config.afterSelectionChange(r,t)}}},G=function(e,t){e.headerCellStyle=function(e){return{height:e.headerRowHeight+"px"}},e.rowStyle=function(t){var n={top:t.offsetTop+"px",height:e.rowHeight+"px"};return t.isAggRow&&(n.left=t.offsetLeft),n},e.canvasStyle=function(){return{height:t.maxCanvasHt+"px"}},e.headerScrollerStyle=function(){return{height:t.config.headerRowHeight+"px"}},e.topPanelStyle=function(){return{width:t.rootDim.outerWidth+"px",height:e.topPanelHeight()+"px"}},e.headerStyle=function(){return{width:t.rootDim.outerWidth+"px",height:t.config.headerRowHeight+"px"}},e.groupPanelStyle=function(){return{width:t.rootDim.outerWidth+"px",height:"32px"}},e.viewportStyle=function(){return{width:t.rootDim.outerWidth+"px",height:e.viewportDimHeight()+"px"}},e.footerStyle=function(){return{width:t.rootDim.outerWidth+"px",height:e.footerRowHeight+"px"}}};p.directive("ngCellHasFocus",["$domUtilityService",function(e){var t=function(t){t.isFocused=!0,e.digest(t),t.$broadcast("ngGridEventStartCellEdit"),t.$on("ngGridEventEndCellEdit",function(){t.isFocused=!1,e.digest(t)})};return function(e,n){var o=!1,i=!1;e.editCell=function(){e.enableCellEditOnFocus||setTimeout(function(){t(e,n)},0)},n.bind("mousedown",function(){return e.enableCellEditOnFocus?i=!0:n.focus(),!0}),n.bind("click",function(o){e.enableCellEditOnFocus&&(o.preventDefault(),i=!1,t(e,n))}),n.bind("focus",function(){return o=!0,e.enableCellEditOnFocus&&!i&&t(e,n),!0}),n.bind("blur",function(){return o=!1,!0}),n.bind("keydown",function(i){return e.enableCellEditOnFocus||(o&&37!==i.keyCode&&38!==i.keyCode&&39!==i.keyCode&&40!==i.keyCode&&9!==i.keyCode&&!i.shiftKey&&13!==i.keyCode&&t(e,n),o&&i.shiftKey&&i.keyCode>=65&&90>=i.keyCode&&t(e,n),27===i.keyCode&&n.focus()),!0})}}]),p.directive("ngCellText",function(){return function(e,t){t.bind("mouseover",function(e){e.preventDefault(),t.css({cursor:"text"})}),t.bind("mouseleave",function(e){e.preventDefault(),t.css({cursor:"default"})})}}),p.directive("ngCell",["$compile","$domUtilityService",function(e,t){var n={scope:!1,compile:function(){return{pre:function(t,n){var o,i=t.col.cellTemplate.replace(d,"row.entity."+t.col.field);t.col.enableCellEdit?(o=t.col.cellEditTemplate,o=o.replace(u,i),o=o.replace(f,t.col.editableCellTemplate.replace(d,"row.entity."+t.col.field))):o=i;var r=e(o)(t);t.enableCellSelection&&-1===r[0].className.indexOf("ngSelectionCell")&&(r[0].setAttribute("tabindex",0),r.addClass("ngCellElement")),n.append(r)},post:function(e,n){e.enableCellSelection&&e.domAccessProvider.selectionHandlers(e,n),e.$on("ngGridEventDigestCell",function(){t.digest(e)})}}}};return n}]),p.directive("ngEditCellIf",[function(){return{transclude:"element",priority:1e3,terminal:!0,restrict:"A",compile:function(e,t,n){return function(e,t,o){var i,r;e.$watch(o.ngEditCellIf,function(o){i&&(i.remove(),i=void 0),r&&(r.$destroy(),r=void 0),o&&(r=e.$new(),n(r,function(e){i=e,t.after(e)}))})}}}}]),p.directive("ngGridFooter",["$compile","$templateCache",function(e,t){var n={scope:!1,compile:function(){return{pre:function(n,o){0===o.children().length&&o.append(e(t.get(n.gridId+"footerTemplate.html"))(n))}}}};return n}]),p.directive("ngGridMenu",["$compile","$templateCache",function(e,t){var n={scope:!1,compile:function(){return{pre:function(n,o){0===o.children().length&&o.append(e(t.get(n.gridId+"menuTemplate.html"))(n))}}}};return n}]),p.directive("ngGrid",["$compile","$filter","$templateCache","$sortService","$domUtilityService","$utilityService","$timeout","$parse","$http","$q",function(e,n,o,i,r,l,a,s,c,g){var d={scope:!0,compile:function(){return{pre:function(d,u,f){var h=t(u),p=d.$eval(f.ngGrid);p.gridDim=new b({outerHeight:t(h).height(),outerWidth:t(h).width()});var m=new T(d,p,i,r,n,o,l,a,s,c,g);return m.init().then(function(){if("string"==typeof p.columnDefs?d.$parent.$watch(p.columnDefs,function(e){return e?(m.lateBoundColumns=!1,d.columns=[],m.config.columnDefs=e,m.buildColumns(),m.eventProvider.assignEvents(),r.RebuildGrid(d,m),void 0):(m.refreshDomSizes(),m.buildColumns(),void 0)},!0):m.buildColumns(),"string"==typeof p.totalServerItems?d.$parent.$watch(p.totalServerItems,function(e){d.totalServerItems=angular.isDefined(e)?e:0}):d.totalServerItems=0,"string"==typeof p.data){var n=function(e){m.data=t.extend([],e),m.rowFactory.fixRowCache(),angular.forEach(m.data,function(e,t){var n=m.rowMap[t]||t;m.rowCache[n]&&m.rowCache[n].ensureEntity(e),m.rowMap[n]=t}),m.searchProvider.evalFilter(),m.configureColumnWidths(),m.refreshDomSizes(),m.config.sortInfo.fields.length>0&&(m.sortColumnsInit(),d.$emit("ngGridEventSorted",m.config.sortInfo)),d.$emit("ngGridEventData",m.gridId)};d.$parent.$watch(p.data,n),d.$parent.$watch(p.data+".length",function(){n(d.$eval(p.data))})}return m.footerController=new y(d,m),u.addClass("ngGrid").addClass(""+m.gridId),p.enableHighlighting||u.addClass("unselectable"),p.jqueryUITheme&&u.addClass("ui-widget"),u.append(e(o.get("gridTemplate.html"))(d)),r.AssignGridContainers(d,u,m),m.eventProvider=new x(m,d,r,a),p.selectRow=function(e,t){m.rowCache[e]&&(m.rowCache[e].clone&&m.rowCache[e].clone.setSelection(t?!0:!1),m.rowCache[e].setSelection(t?!0:!1))},p.selectItem=function(e,t){p.selectRow(m.rowMap[e],t)},p.selectAll=function(e){d.toggleSelectAll(e)},p.selectVisible=function(e){d.toggleSelectAll(e,!0)},p.groupBy=function(e){if(e)d.groupBy(d.columns.filter(function(t){return t.field===e})[0]);else{var n=t.extend(!0,[],d.configGroups);angular.forEach(n,d.groupBy)}},p.sortBy=function(e){var t=d.columns.filter(function(t){return t.field===e})[0];t&&t.sort()},p.gridId=m.gridId,p.ngGrid=m,p.$gridScope=d,p.$gridServices={SortService:i,DomUtilityService:r,UtilityService:l},d.$on("ngGridEventDigestGrid",function(){r.digest(d.$parent)}),d.$on("ngGridEventDigestGridParent",function(){r.digest(d.$parent)}),d.$evalAsync(function(){d.adjustScrollLeft(0)}),angular.forEach(p.plugins,function(e){"function"==typeof e&&(e=new e),e.init(d.$new(),m,p.$gridServices),p.plugins[l.getInstanceType(e)]=e}),"function"==typeof p.init&&p.init(m,d),null})}}}};return d}]),p.directive("ngHeaderCell",["$compile",function(e){var t={scope:!1,compile:function(){return{pre:function(t,n){n.append(e(t.col.headerCellTemplate)(t))}}}};return t}]),p.directive("ngInput",[function(){return{require:"ngModel",link:function(e,t,n,o){var i,r=e.$watch("ngModel",function(){i=o.$modelValue,r()});t.bind("keydown",function(n){switch(n.keyCode){case 37:case 38:case 39:case 40:n.stopPropagation();break;case 27:e.$$phase||e.$apply(function(){o.$setViewValue(i),t.blur()});break;case 13:(e.enableCellEditOnFocus&&e.totalFilteredItemsLength()-1>e.row.rowIndex&&e.row.rowIndex>0||e.enableCellEdit)&&t.blur()}return!0}),t.bind("click",function(e){e.stopPropagation()}),t.bind("mousedown",function(e){e.stopPropagation()}),e.$on("ngGridEventStartCellEdit",function(){t.focus(),t.select()}),angular.element(t).bind("blur",function(){e.$emit("ngGridEventEndCellEdit")})}}}]),p.directive("ngRow",["$compile","$domUtilityService","$templateCache",function(e,t,n){var o={scope:!1,compile:function(){return{pre:function(o,i){if(o.row.elm=i,o.row.clone&&(o.row.clone.elm=i),o.row.isAggRow){var r=n.get(o.gridId+"aggregateTemplate.html");r=o.row.aggLabelFilter?r.replace(g,"| "+o.row.aggLabelFilter):r.replace(g,""),i.append(e(r)(o))}else i.append(e(n.get(o.gridId+"rowTemplate.html"))(o));o.$on("ngGridEventDigestRow",function(){t.digest(o)})}}}};return o}]),p.directive("ngViewport",[function(){return function(e,t){var n,o,i=0;t.bind("scroll",function(t){var r=t.target.scrollLeft,l=t.target.scrollTop;return e.$headerContainer&&e.$headerContainer.scrollLeft(r),e.adjustScrollLeft(r),e.adjustScrollTop(l),e.$root.$$phase||e.$digest(),o=r,i=l,n=!1,!0}),t.bind("mousewheel DOMMouseScroll",function(){return n=!0,t.focus&&t.focus(),!0}),e.enableCellSelection||e.domAccessProvider.selectionHandlers(e,t)}}]),e.ngGrid.i18n.da={ngAggregateLabel:"artikler",ngGroupPanelDescription:"Grupér rækker udfra en kolonne ved at trække dens overskift hertil.",ngSearchPlaceHolder:"Søg...",ngMenuText:"Vælg kolonner:",ngShowingItemsLabel:"Viste rækker:",ngTotalItemsLabel:"Rækker totalt:",ngSelectedItemsLabel:"Valgte rækker:",ngPageSizeLabel:"Side størrelse:",ngPagerFirstTitle:"Første side",ngPagerNextTitle:"Næste side",ngPagerPrevTitle:"Forrige side",ngPagerLastTitle:"Sidste side"},e.ngGrid.i18n.de={ngAggregateLabel:"artikel",ngGroupPanelDescription:"Ziehen Sie eine Spaltenüberschrift hier und legen Sie es der Gruppe nach dieser Spalte.",ngSearchPlaceHolder:"Suche...",ngMenuText:"Spalten auswählen:",ngShowingItemsLabel:"Zeige Artikel:",ngTotalItemsLabel:"Meiste Artikel:",ngSelectedItemsLabel:"Ausgewählte Artikel:",ngPageSizeLabel:"Größe Seite:",ngPagerFirstTitle:"Erste Page",ngPagerNextTitle:"Nächste Page",ngPagerPrevTitle:"Vorherige Page",ngPagerLastTitle:"Letzte Page"},e.ngGrid.i18n.en={ngAggregateLabel:"items",ngGroupPanelDescription:"Drag a column header here and drop it to group by that column.",ngSearchPlaceHolder:"Search...",ngMenuText:"Choose Columns:",ngShowingItemsLabel:"Showing Items:",ngTotalItemsLabel:"Total Items:",ngSelectedItemsLabel:"Selected Items:",ngPageSizeLabel:"Page Size:",ngPagerFirstTitle:"First Page",ngPagerNextTitle:"Next Page",ngPagerPrevTitle:"Previous Page",ngPagerLastTitle:"Last Page"},e.ngGrid.i18n.es={ngAggregateLabel:"Artículos",ngGroupPanelDescription:"Arrastre un encabezado de columna aquí y soltarlo para agrupar por esa columna.",ngSearchPlaceHolder:"Buscar...",ngMenuText:"Elegir columnas:",ngShowingItemsLabel:"Artículos Mostrando:",ngTotalItemsLabel:"Artículos Totales:",ngSelectedItemsLabel:"Artículos Seleccionados:",ngPageSizeLabel:"Tamaño de Página:",ngPagerFirstTitle:"Primera Página",ngPagerNextTitle:"Página Siguiente",ngPagerPrevTitle:"Página Anterior",ngPagerLastTitle:"Última Página"},e.ngGrid.i18n.fr={ngAggregateLabel:"articles",ngGroupPanelDescription:"Faites glisser un en-tête de colonne ici et déposez-le vers un groupe par cette colonne.",ngSearchPlaceHolder:"Recherche...",ngMenuText:"Choisir des colonnes:",ngShowingItemsLabel:"Articles Affichage des:",ngTotalItemsLabel:"Nombre total d'articles:",ngSelectedItemsLabel:"Éléments Articles:",ngPageSizeLabel:"Taille de page:",ngPagerFirstTitle:"Première page",ngPagerNextTitle:"Page Suivante",ngPagerPrevTitle:"Page précédente",ngPagerLastTitle:"Dernière page"},e.ngGrid.i18n["pt-br"]={ngAggregateLabel:"items",ngGroupPanelDescription:"Arraste e solte uma coluna aqui para agrupar por essa coluna",ngSearchPlaceHolder:"Procurar...",ngMenuText:"Selecione as colunas:",ngShowingItemsLabel:"Mostrando os Items:",ngTotalItemsLabel:"Total de Items:",ngSelectedItemsLabel:"Items Selecionados:",ngPageSizeLabel:"Tamanho da Página:",ngPagerFirstTitle:"Primeira Página",ngPagerNextTitle:"Próxima Página",ngPagerPrevTitle:"Página Anterior",ngPagerLastTitle:"Última Página"},e.ngGrid.i18n["zh-cn"]={ngAggregateLabel:"条目",ngGroupPanelDescription:"拖曳表头到此处以进行分组",ngSearchPlaceHolder:"搜索...",ngMenuText:"数据分组与选择列：",ngShowingItemsLabel:"当前显示条目：",ngTotalItemsLabel:"条目总数：",ngSelectedItemsLabel:"选中条目：",ngPageSizeLabel:"每页显示数：",ngPagerFirstTitle:"回到首页",ngPagerNextTitle:"下一页",ngPagerPrevTitle:"上一页",ngPagerLastTitle:"前往尾页"},e.ngGrid.i18n["zh-tw"]={ngAggregateLabel:"筆",ngGroupPanelDescription:"拖拉表頭到此處以進行分組",ngSearchPlaceHolder:"搜尋...",ngMenuText:"選擇欄位：",ngShowingItemsLabel:"目前顯示筆數：",ngTotalItemsLabel:"總筆數：",ngSelectedItemsLabel:"選取筆數：",ngPageSizeLabel:"每頁顯示：",ngPagerFirstTitle:"第一頁",ngPagerNextTitle:"下一頁",ngPagerPrevTitle:"上一頁",ngPagerLastTitle:"最後頁"},angular.module("ngGrid").run(["$templateCache",function(e){e.put("aggregateTemplate.html",'<div ng-click="row.toggleExpand()" ng-style="rowStyle(row)" class="ngAggregate"> <span class="ngAggregateText">{{row.label CUSTOM_FILTERS}} ({{row.totalChildren()}} {{AggItemsLabel}})</span> <div class="{{row.aggClass()}}"></div></div>'),e.put("cellEditTemplate.html",'<div ng-cell-has-focus ng-dblclick="editCell()"> <div ng-edit-cell-if="!isFocused"> DISPLAY_CELL_TEMPLATE </div> <div ng-edit-cell-if="isFocused"> EDITABLE_CELL_TEMPLATE </div></div>'),e.put("cellTemplate.html",'<div class="ngCellText" ng-class="col.colIndex()"><span ng-cell-text>{{COL_FIELD CUSTOM_FILTERS}}</span></div>'),e.put("checkboxCellTemplate.html",'<div class="ngSelectionCell"><input tabindex="-1" class="ngSelectionCheckbox" type="checkbox" ng-checked="row.selected" /></div>'),e.put("checkboxHeaderTemplate.html",'<input class="ngSelectionHeader" type="checkbox" ng-show="multiSelect" ng-model="allSelected" ng-change="toggleSelectAll(allSelected, true)"/>'),e.put("editableCellTemplate.html",'<input ng-class="\'colt\' + col.index" ng-input="COL_FIELD" ng-model="COL_FIELD" />'),e.put("footerTemplate.html",'<div ng-show="showFooter" class="ngFooterPanel" ng-class="{\'ui-widget-content\': jqueryUITheme, \'ui-corner-bottom\': jqueryUITheme}" ng-style="footerStyle()"> <div class="ngTotalSelectContainer" > <div class="ngFooterTotalItems" ng-class="{\'ngNoMultiSelect\': !multiSelect}" > <span class="ngLabel">{{i18n.ngTotalItemsLabel}} {{maxRows()}}</span><span ng-show="filterText.length > 0" class="ngLabel">({{i18n.ngShowingItemsLabel}} {{totalFilteredItemsLength()}})</span> </div> <div class="ngFooterSelectedItems" ng-show="multiSelect"> <span class="ngLabel">{{i18n.ngSelectedItemsLabel}} {{selectedItems.length}}</span> </div> </div> <div class="ngPagerContainer" style="float: right; margin-top: 10px;" ng-show="enablePaging" ng-class="{\'ngNoMultiSelect\': !multiSelect}"> <div style="float:left; margin-right: 10px;" class="ngRowCountPicker"> <span style="float: left; margin-top: 3px;" class="ngLabel">{{i18n.ngPageSizeLabel}}</span> <select style="float: left;height: 27px; width: 100px" ng-model="pagingOptions.pageSize" > <option ng-repeat="size in pagingOptions.pageSizes">{{size}}</option> </select> </div> <div style="float:left; margin-right: 10px; line-height:25px;" class="ngPagerControl" style="float: left; min-width: 135px;"> <button class="ngPagerButton" ng-click="pageToFirst()" ng-disabled="cantPageBackward()" title="{{i18n.ngPagerFirstTitle}}"><div class="ngPagerFirstTriangle"><div class="ngPagerFirstBar"></div></div></button> <button class="ngPagerButton" ng-click="pageBackward()" ng-disabled="cantPageBackward()" title="{{i18n.ngPagerPrevTitle}}"><div class="ngPagerFirstTriangle ngPagerPrevTriangle"></div></button> <input class="ngPagerCurrent" min="1" max="{{maxPages()}}" type="number" style="width:50px; height: 24px; margin-top: 1px; padding: 0 4px;" ng-model="pagingOptions.currentPage"/> <button class="ngPagerButton" ng-click="pageForward()" ng-disabled="cantPageForward()" title="{{i18n.ngPagerNextTitle}}"><div class="ngPagerLastTriangle ngPagerNextTriangle"></div></button> <button class="ngPagerButton" ng-click="pageToLast()" ng-disabled="cantPageToLast()" title="{{i18n.ngPagerLastTitle}}"><div class="ngPagerLastTriangle"><div class="ngPagerLastBar"></div></div></button> </div> </div></div>'),e.put("gridTemplate.html",'<div class="ngTopPanel" ng-class="{\'ui-widget-header\':jqueryUITheme, \'ui-corner-top\': jqueryUITheme}" ng-style="topPanelStyle()"> <div class="ngGroupPanel" ng-show="showGroupPanel()" ng-style="groupPanelStyle()"> <div class="ngGroupPanelDescription" ng-show="configGroups.length == 0">{{i18n.ngGroupPanelDescription}}</div> <ul ng-show="configGroups.length > 0" class="ngGroupList"> <li class="ngGroupItem" ng-repeat="group in configGroups"> <span class="ngGroupElement"> <span class="ngGroupName">{{group.displayName}} <span ng-click="removeGroup($index)" class="ngRemoveGroup">x</span> </span> <span ng-hide="$last" class="ngGroupArrow"></span> </span> </li> </ul> </div> <div class="ngHeaderContainer" ng-style="headerStyle()"> <div class="ngHeaderScroller" ng-style="headerScrollerStyle()" ng-include="gridId + \'headerRowTemplate.html\'"></div> </div> <div ng-grid-menu></div></div><div class="ngViewport" unselectable="on" ng-viewport ng-class="{\'ui-widget-content\': jqueryUITheme}" ng-style="viewportStyle()"> <div class="ngCanvas" ng-style="canvasStyle()"> <div ng-style="rowStyle(row)" ng-repeat="row in renderedRows" ng-click="row.toggleSelected($event)" ng-class="row.alternatingRowClass()" ng-row></div> </div></div><div ng-grid-footer></div>'),e.put("headerCellTemplate.html",'<div class="ngHeaderSortColumn {{col.headerClass}}" ng-style="{\'cursor\': col.cursor}" ng-class="{ \'ngSorted\': !noSortVisible }"> <div ng-click="col.sort($event)" ng-class="\'colt\' + col.index" class="ngHeaderText">{{col.displayName}}</div> <div class="ngSortButtonDown" ng-show="col.showSortButtonDown()"></div> <div class="ngSortButtonUp" ng-show="col.showSortButtonUp()"></div> <div class="ngSortPriority">{{col.sortPriority}}</div> <div ng-class="{ ngPinnedIcon: col.pinned, ngUnPinnedIcon: !col.pinned }" ng-click="togglePin(col)" ng-show="col.pinnable"></div></div><div ng-show="col.resizable" class="ngHeaderGrip" ng-click="col.gripClick($event)" ng-mousedown="col.gripOnMouseDown($event)"></div>'),e.put("headerRowTemplate.html",'<div ng-style="{ height: col.headerRowHeight }" ng-repeat="col in renderedColumns" ng-class="col.colIndex()" class="ngHeaderCell"> <div class="ngVerticalBar" ng-style="{height: col.headerRowHeight}" ng-class="{ ngVerticalBarVisible: !$last }"> </div> <div ng-header-cell></div></div>'),e.put("menuTemplate.html",'<div ng-show="showColumnMenu || showFilter" class="ngHeaderButton" ng-click="toggleShowMenu()"> <div class="ngHeaderButtonArrow"></div></div><div ng-show="showMenu" class="ngColMenu"> <div ng-show="showFilter"> <input placeholder="{{i18n.ngSearchPlaceHolder}}" type="text" ng-model="filterText"/> </div> <div ng-show="showColumnMenu"> <span class="ngMenuText">{{i18n.ngMenuText}}</span> <ul class="ngColList"> <li class="ngColListItem" ng-repeat="col in columns | ngColumns"> <label><input ng-disabled="col.pinned" type="checkbox" class="ngColListCheckbox" ng-model="col.visible"/>{{col.displayName}}</label> <a title="Group By" ng-class="col.groupedByClass()" ng-show="col.groupable && col.visible" ng-click="groupBy(col)"></a> <span class="ngGroupingNumber" ng-show="col.groupIndex > 0">{{col.groupIndex}}</span> </li> </ul> </div></div>'),e.put("rowTemplate.html",'<div ng-style="{ \'cursor\': row.cursor }" ng-repeat="col in renderedColumns" ng-class="col.colIndex()" class="ngCell {{col.cellClass}}"> <div class="ngVerticalBar" ng-style="{height: rowHeight}" ng-class="{ ngVerticalBarVisible: !$last }"> </div> <div ng-cell></div></div>')}])})(window,jQuery); \ No newline at end of file Modified: trunk/chorem-webmotion/src/main/webapp/js/ng-select2.js =================================================================== --- trunk/chorem-webmotion/src/main/webapp/js/ng-select2.js 2014-02-19 16:29:51 UTC (rev 406) +++ trunk/chorem-webmotion/src/main/webapp/js/ng-select2.js 2014-02-19 16:38:14 UTC (rev 407) @@ -1,3 +1,25 @@ +/* + * #%L + * Chorem :: webmotion + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2011 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ /** * Enhanced Select2 Dropmenus * Modified: trunk/chorem-webmotion/src/main/webapp/js/ng-wikitty.js =================================================================== --- trunk/chorem-webmotion/src/main/webapp/js/ng-wikitty.js 2014-02-19 16:29:51 UTC (rev 406) +++ trunk/chorem-webmotion/src/main/webapp/js/ng-wikitty.js 2014-02-19 16:38:14 UTC (rev 407) @@ -1,3 +1,25 @@ +/* + * #%L + * Chorem :: webmotion + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2011 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ var wikitty = angular.module('wikitty', ['ngResource', 'ngGrid', 'ui.select2']); wikitty.factory('Wikitty', function($resource){ Modified: trunk/chorem-webmotion/src/main/webapp/js/projectPagination.js =================================================================== --- trunk/chorem-webmotion/src/main/webapp/js/projectPagination.js 2014-02-19 16:29:51 UTC (rev 406) +++ trunk/chorem-webmotion/src/main/webapp/js/projectPagination.js 2014-02-19 16:38:14 UTC (rev 407) @@ -1,3 +1,25 @@ +/* + * #%L + * Chorem :: webmotion + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2011 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ var app = angular.module('projectList', ['ngTable', 'ngResource']); app.controller('PageCtrl', Modified: trunk/chorem-webmotion/src/main/webapp/js/salesFunnel.js =================================================================== --- trunk/chorem-webmotion/src/main/webapp/js/salesFunnel.js 2014-02-19 16:29:51 UTC (rev 406) +++ trunk/chorem-webmotion/src/main/webapp/js/salesFunnel.js 2014-02-19 16:38:14 UTC (rev 407) @@ -1,3 +1,25 @@ +/* + * #%L + * Chorem :: webmotion + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2011 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ var salesFunnel = angular.module('salesFunnel', ['wikitty', 'ui.bootstrap', 'ui.date']); salesFunnel.directive('datepicker', function() { Modified: trunk/chorem-webmotion/src/main/webapp/js/select2.min.js =================================================================== --- trunk/chorem-webmotion/src/main/webapp/js/select2.min.js 2014-02-19 16:29:51 UTC (rev 406) +++ trunk/chorem-webmotion/src/main/webapp/js/select2.min.js 2014-02-19 16:38:14 UTC (rev 407) @@ -1,4 +1,26 @@ /* + * #%L + * Chorem :: webmotion + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2011 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +/* Copyright 2012 Igor Vaynberg Version: 3.4.1 Timestamp: Thu Jun 27 18:02:10 PDT 2013 Modified: trunk/src/site/rst/calculations.rst =================================================================== --- trunk/src/site/rst/calculations.rst 2014-02-19 16:29:51 UTC (rev 406) +++ trunk/src/site/rst/calculations.rst 2014-02-19 16:38:14 UTC (rev 407) @@ -1,3 +1,25 @@ +.. - +.. * #%L +.. * Chorem +.. * $Id:$ +.. * $HeadURL:$ +.. * %% +.. * Copyright (C) 2011 - 2014 CodeLutin +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU Affero General Public License as published by +.. * the Free Software Foundation, either version 3 of the License, or +.. * (at your option) any later version. +.. * +.. * This program is distributed in the hope that it will be useful, +.. * but WITHOUT ANY WARRANTY; without even the implied warranty of +.. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +.. * GNU General Public License for more details. +.. * +.. * You should have received a copy of the GNU Affero General Public License +.. * along with this program. If not, see <http://www.gnu.org/licenses/>. +.. * #L% +.. - ======================== Gestion de projet Chorem ========================

1 0

r406 - trunk/chorem-webmotion/src/doc
by ymartel＠users.chorem.org 19 Feb '14

19 Feb '14

Author: ymartel Date: 2014-02-19 17:29:51 +0100 (Wed, 19 Feb 2014) New Revision: 406 Url: http://chorem.org/projects/chorem/repository/revisions/406 Log: some update on doc Modified: trunk/chorem-webmotion/src/doc/REST_API_Timer.txt Modified: trunk/chorem-webmotion/src/doc/REST_API_Timer.txt =================================================================== --- trunk/chorem-webmotion/src/doc/REST_API_Timer.txt 2014-02-19 16:15:27 UTC (rev 405) +++ trunk/chorem-webmotion/src/doc/REST_API_Timer.txt 2014-02-19 16:29:51 UTC (rev 406) @@ -45,10 +45,9 @@ Should the {user} parameter in URL or just as request parameter ? - If want to follow Restfull resources hierarchy, we should have projects > {project} > quotations > {quotation} > tasks > {task} > times (or workers) > {time} (or {worker}) In this, the user is more a kind of filter on the request, So, I prefer keep it as request parameter +As we have simple hierarchy, we can also simplify the URLs, and begin the hierarchy directly from a specific Task : - - +tasks > {task} > times (or workers) > {time} (or {worker})

1 0

r405 - in trunk/chorem-webmotion/src: . doc
by ymartel＠users.chorem.org 19 Feb '14

19 Feb '14

Author: ymartel Date: 2014-02-19 17:15:27 +0100 (Wed, 19 Feb 2014) New Revision: 405 Url: http://chorem.org/projects/chorem/repository/revisions/405 Log: Add some doc about REST API for Task-Timing Added: trunk/chorem-webmotion/src/doc/ trunk/chorem-webmotion/src/doc/REST_API_Timer.txt Added: trunk/chorem-webmotion/src/doc/REST_API_Timer.txt =================================================================== --- trunk/chorem-webmotion/src/doc/REST_API_Timer.txt (rev 0) +++ trunk/chorem-webmotion/src/doc/REST_API_Timer.txt 2014-02-19 16:15:27 UTC (rev 405) @@ -0,0 +1,54 @@ +Project Management : Task Timer interaction +=========================================== + +Need +---- + +- CRUD and List Operations for Tasks +- add/update Time for Task/User + + +Task Operations +--------------- + +GET /projects/{quotationId}/tasks?{user} : Get all the Tasks for an user on a project (quotationId) +PUT /projects/{quotationId}/tasks?{user} : Add a new Task for the project +PUT /projects/{quotationId}/tasks/{taskId}?{user} : Update Task + + +Time Operations +--------------- + +GET /projects/times?{user}&start={startDate}&end={endDtate} : Get all times for a period. Start and end are optional. +PUT /projects/times?{user} : Update/Add Times for an user on several projects + reports = [ {"taskId": "{taskId}", "times": [{"id":"{timeId}", "start": "{startDate}", "end": "{endDate}"}, {"id":"{timeId}", "start": "{startDate}", "end": "{endDate}"}]}, + {"taskId": "{taskId}", "times": [{"id":"{timeId}", "start": "{startDate}", "end": "{endDate}"}, {"id":"{timeId}", "start": "{startDate}", "end": "{endDate}"}]}] +PUT /projects/{quotationId}/tasks/{taskId}/times?{user} : Update/Add Times for an user on a Task (if no Id, create) + times = [ {"id":"{timeId}", "start": "{startDate}", "end": "{endDate}"}, {"id":"{timeId}", "start": "{startDate}", "end": "{endDate}"}] +GET /projects/{quotationId}/tasks/{taskId}/times?{user} : GET all Times corresponding to a Task and an user + + + +More : Generalize REST API for Task +=================================== + +PUT /projects/{quotationId}/tasks/{taskId}?{user} : Delete Task +GET /projects/{quotationId}/tasks/{taskId}/workers?{user} : Get all workers on a Task +PUT /projects/{quotationId}/tasks/{taskId}/workers?{user} : Add a worker for the Task + + +Doubts +====== + +Way to make URL +--------------- + +Should the {user} parameter in URL or just as request parameter ? + + +If want to follow Restfull resources hierarchy, we should have projects > {project} > quotations > {quotation} > tasks > {task} > times (or workers) > {time} (or {worker}) +In this, the user is more a kind of filter on the request, So, I prefer keep it as request parameter + + + +

1 0

r404 - trunk
by ymartel＠users.chorem.org 19 Feb '14

19 Feb '14

Author: ymartel Date: 2014-02-19 10:31:27 +0100 (Wed, 19 Feb 2014) New Revision: 404 Url: http://chorem.org/projects/chorem/repository/revisions/404 Log: override java version for compiler Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-02-14 15:15:41 UTC (rev 403) +++ trunk/pom.xml 2014-02-19 09:31:27 UTC (rev 404) @@ -112,6 +112,10 @@  <i18n.bundles>fr_FR,en_GB</i18n.bundles> <i18n.silent>true</i18n.silent> + +  + <javaVersion>1.7</javaVersion> + </properties> <repositories>

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
55
Older →

Jump to page: