This is an automated email from the git hooks/post-receive script. New commit to branch chorem-ng in repository chorem. See http://git.chorem.org/chorem.git commit 56e536ab2e7cbb104519fd5b83644b3778b9e928 Author: kootox <jean.couteau@gmail.com> Date: Thu Jul 2 15:28:39 2015 +0200 refs #1211 : finish company view --- .../src/main/webapp/crm/partials/companies.list.html | 4 ++-- .../webapp/crm/partials/contactDetailsListCard.html | 10 +++++----- .../main/webapp/crm/partials/employeesListCard.html | 10 +++++----- .../main/webapp/crm/partials/invoicesListCard.html | 6 +++--- .../src/main/webapp/crm/partials/notesListCard.html | 10 +++++----- .../src/main/webapp/js/crm/crmControllers.js | 20 ++++++++++---------- 6 files changed, 30 insertions(+), 30 deletions(-) diff --git a/chorem-ui-angular/src/main/webapp/crm/partials/companies.list.html b/chorem-ui-angular/src/main/webapp/crm/partials/companies.list.html index c1795ad..210b4dc 100644 --- a/chorem-ui-angular/src/main/webapp/crm/partials/companies.list.html +++ b/chorem-ui-angular/src/main/webapp/crm/partials/companies.list.html @@ -23,8 +23,8 @@ </div> <div class="list-group"> - <a class="list-group-item" href="#/companies/{{company.id}}" - ng-repeat="company in filteredItems" + <a class="list-group-item" href="#/crm/companies/{{company.id}}" + ng-repeat="company in filteredItems | orderBy:'Company.name'" ng-class="{'active':isItemSelected(company)}" ng-click="selectItem(company)"> <i class="fa fa-3x fa-building-o pull-left"></i> diff --git a/chorem-ui-angular/src/main/webapp/crm/partials/contactDetailsListCard.html b/chorem-ui-angular/src/main/webapp/crm/partials/contactDetailsListCard.html index 7fb412a..afd8778 100644 --- a/chorem-ui-angular/src/main/webapp/crm/partials/contactDetailsListCard.html +++ b/chorem-ui-angular/src/main/webapp/crm/partials/contactDetailsListCard.html @@ -2,23 +2,23 @@ <div class="panel-heading clearfix"> <h3 class="panel-title pull-left">Moyens de contact</h3> <div class="btn-group pull-right visible-xs"> - <a class="btn btn-primary" href="#/companies/{{company.wikittyId}}/contactDetails/add" + <a class="btn btn-primary" href="#/companies/{{company.id}}/contactDetails/add" data-toggle="modal" data-target="#editModal"> <i class="fa fa-plus"></i> <span>Ajouter</span> </a> </div> - <a class="btn btn-primary pull-right hidden-xs" href="#/companies/{{company.wikittyId}}/contactDetails/add"> + <a class="btn btn-primary pull-right hidden-xs" href="#/companies/{{companyId}}/contactDetails/add"> <i class="fa fa-plus"></i> <span>Ajouter</span> </a> </div> <div class="list-group"> <a class="list-group-item" ng-repeat="contact in contactDetails" - href="#/companies/{{company.wikittyId}}/contactDetails/{{contact.wikittyId}}"> - <label>{{contact.type}} - {{contact.name}}</label> - <h4 class="list-group-item-heading">{{contact.value}}</h4> + href="#/companies/{{companyId}}/contactDetails/{{contact.id}}"> + <label>{{contact.ContactDetails.type}} - {{contact.ContactDetails.name}}</label> + <h4 class="list-group-item-heading">{{contact.ContactDetails.value}}</h4> </a> </div> </div> \ No newline at end of file diff --git a/chorem-ui-angular/src/main/webapp/crm/partials/employeesListCard.html b/chorem-ui-angular/src/main/webapp/crm/partials/employeesListCard.html index 4439360..054ab1d 100644 --- a/chorem-ui-angular/src/main/webapp/crm/partials/employeesListCard.html +++ b/chorem-ui-angular/src/main/webapp/crm/partials/employeesListCard.html @@ -2,19 +2,19 @@ <div class="panel-heading clearfix"> <h3 class="panel-title pull-left">Employés</h3> <div class="btn-group pull-right visible-xs"> - <a class="btn btn-primary" href="#/companies/{{company.wikittyId}}/employees/add"> + <a class="btn btn-primary" href="#/companies/{{company.id}}/employees/add"> <i class="fa fa-plus"></i><span>Ajouter</span> </a> </div> - <a class="btn btn-primary pull-right hidden-xs" href="#/companies/{{company.wikittyId}}/employees/add"> + <a class="btn btn-primary pull-right hidden-xs" href="#/companies/{{company.id}}/employees/add"> <i class="fa fa-plus"></i><span>Ajouter</span> </a> </div> <div class="list-group"> <a class="list-group-item" ng-repeat="employee in employees" - href="#/companies/{{company.wikittyId}}/employees/{{employee.wikittyId}}"> - <label>{{employee.description}}</label> - <h4 class="list-group-item-heading">{{employee.person.firstName}} {{employee.person.lastName}}</h4> + href="#/companies/{{company.id}}/employees/{{employee.id}}"> + <label>{{employee.Employee.description}}</label> + <h4 class="list-group-item-heading">{{employee.Employee.person.Person.firstName}} {{employee.Employee.person.Person.lastName}}</h4> </a> </div> </div> \ No newline at end of file diff --git a/chorem-ui-angular/src/main/webapp/crm/partials/invoicesListCard.html b/chorem-ui-angular/src/main/webapp/crm/partials/invoicesListCard.html index 89d5ad6..07cfd8a 100644 --- a/chorem-ui-angular/src/main/webapp/crm/partials/invoicesListCard.html +++ b/chorem-ui-angular/src/main/webapp/crm/partials/invoicesListCard.html @@ -2,18 +2,18 @@ <div class="panel-heading clearfix"> <h3 class="panel-title pull-left">Factures</h3> <div class="btn-group pull-right visible-xs"> - <a class="btn btn-primary" href="#/companies/{{company.wikittyId}}/invoices/add"> + <a class="btn btn-primary" href="#/companies/{{company.id}}/invoices/add"> <i class="fa fa-pencil"></i> <span>Ajouter</span> </a> </div> - <a class="btn btn-primary pull-right hidden-xs" href="#/companies/{{company.wikittyId}}/invoices/add"> + <a class="btn btn-primary pull-right hidden-xs" href="#/companies/{{company.id}}/invoices/add"> <i class="fa fa-plus"></i> <span>Ajouter</span> </a> </div> <div class="list-group"> - <a class="list-group-item" ng-repeat="invoice in invoices" href="#/companies/{{company.wikittyId}}/invoices/{{invoice.wikittyId}}"/> + <a class="list-group-item" ng-repeat="invoice in invoices" href="#/companies/{{company.id}}/invoices/{{invoice.wikittyId}}"/> <label>{{invoice.emittedDate | date : dd/MM/yyy}} - {{invoice.description}}</label> <h4 class="list-group-item-heading">{{invoice.reference}} - {{invoice.amount|currency}}</h4> </a> diff --git a/chorem-ui-angular/src/main/webapp/crm/partials/notesListCard.html b/chorem-ui-angular/src/main/webapp/crm/partials/notesListCard.html index 81c3653..865ea64 100644 --- a/chorem-ui-angular/src/main/webapp/crm/partials/notesListCard.html +++ b/chorem-ui-angular/src/main/webapp/crm/partials/notesListCard.html @@ -2,20 +2,20 @@ <div class="panel-heading clearfix"> <h3 class="panel-title pull-left">Notes</h3> <div class="btn-group pull-right visible-xs"> - <a class="btn btn-primary" href="#/companies/{{company.wikittyId}}/notes/add"> + <a class="btn btn-primary" href="#/companies/{{company.id}}/notes/add"> <i class="fa fa-pencil"></i> <span>Ajouter</span> </a> </div> - <a class="btn btn-primary pull-right hidden-xs" href="#/companies/{{company.wikittyId}}/notes/add"> + <a class="btn btn-primary pull-right hidden-xs" href="#/companies/{{company.id}}/notes/add"> <i class="fa fa-plus"></i> <span>Ajouter</span> </a> </div> <div class="list-group"> - <a class="list-group-item" ng-repeat="note in notes" href="#/companies/{{company.wikittyId}}/notes/{{note.wikittyId}}"/> - <h4 class="list-group-item-heading">{{note.title}}</h4> - <label>{{note.date | date : dd/MM/yyy}}</label> + <a class="list-group-item" ng-repeat="note in notes" href="#/companies/{{company.id}}/notes/{{note.id}}"/> + <h4 class="list-group-item-heading">{{note.Note.title}}</h4> + <label>{{note.Note.date | date : dd/MM/yyy}}</label> </a> </div> </div> \ No newline at end of file diff --git a/chorem-ui-angular/src/main/webapp/js/crm/crmControllers.js b/chorem-ui-angular/src/main/webapp/js/crm/crmControllers.js index 6382420..f805917 100644 --- a/chorem-ui-angular/src/main/webapp/js/crm/crmControllers.js +++ b/chorem-ui-angular/src/main/webapp/js/crm/crmControllers.js @@ -95,17 +95,17 @@ choremCRMControllers.controller('CompanyDetailController', function ($scope, $ht $scope.companyId=$state.params.companyId; $scope.updateCompany=function(){ - if ($scope.companyId){ - $http.get('services/v1/Company/'+$scope.companyId).success(function(data){ - $scope.company = data; - }); - } - }; + if ($scope.companyId){ + $http.get('services/v1/Company/'+$scope.companyId).success(function(data){ + $scope.company = data; + }); + } + }; //get back contact details for the company $scope.updateContactDetails=function(){ if ($scope.companyId){ - $http.get('contactDetails?target='+$scope.companyId).success(function(data){ + $http.get('services/v1/ContactDetails?field=target&value='+$scope.companyId).success(function(data){ $scope.contactDetails = data; }); } @@ -114,7 +114,7 @@ choremCRMControllers.controller('CompanyDetailController', function ($scope, $ht //get back notes for the company $scope.updateNotes=function(){ if ($scope.companyId){ - $http.get('notes?target='+$scope.companyId).success(function(data){ + $http.get('services/v1/Note?field=target&value='+$scope.companyId).success(function(data){ $scope.notes = data; }); } @@ -123,7 +123,7 @@ choremCRMControllers.controller('CompanyDetailController', function ($scope, $ht //get back employees for the company $scope.updateEmployees=function(){ if ($scope.companyId){ - $http.get('employees?company='+$scope.companyId).success(function(data){ + $http.get('services/v1/Employee?field=company&value='+$scope.companyId).success(function(data){ $scope.employees = data; }); } @@ -132,7 +132,7 @@ choremCRMControllers.controller('CompanyDetailController', function ($scope, $ht //get back invoices for the company $scope.updateInvoices=function(){ if ($scope.companyId){ - $http.get('invoices?payer='+$scope.companyId).success(function(data){ + $http.get('services/v1/Invoice?field=payer&value='+$scope.companyId).success(function(data){ $scope.invoices = data; }); } -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.