branch chorem-ng updated (0189b95 -> 3ad55b8)
This is an automated email from the git hooks/post-receive script. New change to branch chorem-ng in repository chorem. See http://git.chorem.org/chorem.git from 0189b95 add path in mapping to filter by a field and to keep deeper on a object collection fields new 56e536a refs #1211 : finish company view new 73963e2 refs #1211 : ContactDetails and Note view new 3ad55b8 refs #1211 : View person (list nots, contact details and employees) The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 3ad55b826d05ac05e0562d24eb6c724d4abb3e61 Author: kootox <jean.couteau@gmail.com> Date: Thu Jul 2 17:48:14 2015 +0200 refs #1211 : View person (list nots, contact details and employees) commit 73963e28de8e5952e880227c806d746295916eb2 Author: kootox <jean.couteau@gmail.com> Date: Thu Jul 2 17:47:15 2015 +0200 refs #1211 : ContactDetails and Note view commit 56e536ab2e7cbb104519fd5b83644b3778b9e928 Author: kootox <jean.couteau@gmail.com> Date: Thu Jul 2 15:28:39 2015 +0200 refs #1211 : finish company view Summary of changes: .../main/webapp/crm/partials/companies.list.html | 4 +- .../crm/partials/contactDetailsListCard.html | 10 ++-- .../webapp/crm/partials/contactDetailsPanel.html | 29 +++++++++++ ...ListCard.html => employeesCompanyListCard.html} | 10 ++-- .../webapp/crm/partials/employeesListCard.html | 10 ++-- .../main/webapp/crm/partials/invoicesListCard.html | 6 +-- .../src/main/webapp/crm/partials/notePanel.html | 30 +++++++++++ .../main/webapp/crm/partials/notesListCard.html | 10 ++-- .../main/webapp/crm/partials/personInfoCard.html | 4 +- .../src/main/webapp/crm/partials/personPanel.html | 2 +- chorem-ui-angular/src/main/webapp/js/crm/crm.js | 12 +++++ .../src/main/webapp/js/crm/crmControllers.js | 60 ++++++++++++++++------ 12 files changed, 144 insertions(+), 43 deletions(-) create mode 100644 chorem-ui-angular/src/main/webapp/crm/partials/contactDetailsPanel.html copy chorem-ui-angular/src/main/webapp/crm/partials/{employeesListCard.html => employeesCompanyListCard.html} (57%) create mode 100644 chorem-ui-angular/src/main/webapp/crm/partials/notePanel.html -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch 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>.
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 73963e28de8e5952e880227c806d746295916eb2 Author: kootox <jean.couteau@gmail.com> Date: Thu Jul 2 17:47:15 2015 +0200 refs #1211 : ContactDetails and Note view --- .../crm/partials/contactDetailsListCard.html | 6 ++-- .../webapp/crm/partials/contactDetailsPanel.html | 29 ++++++++++++++++ .../src/main/webapp/crm/partials/notePanel.html | 30 ++++++++++++++++ .../main/webapp/crm/partials/notesListCard.html | 6 ++-- chorem-ui-angular/src/main/webapp/js/crm/crm.js | 12 +++++++ .../src/main/webapp/js/crm/crmControllers.js | 40 +++++++++++++++++++--- 6 files changed, 112 insertions(+), 11 deletions(-) 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 afd8778..293b644 100644 --- a/chorem-ui-angular/src/main/webapp/crm/partials/contactDetailsListCard.html +++ b/chorem-ui-angular/src/main/webapp/crm/partials/contactDetailsListCard.html @@ -2,21 +2,21 @@ <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.id}}/contactDetails/add" + <a class="btn btn-primary" href="#/crm/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/{{companyId}}/contactDetails/add"> + <a class="btn btn-primary pull-right hidden-xs" href="#/crm/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/{{companyId}}/contactDetails/{{contact.id}}"> + href="#/crm/companies/{{companyId}}/contactDetails/{{contact.id}}"> <label>{{contact.ContactDetails.type}} - {{contact.ContactDetails.name}}</label> <h4 class="list-group-item-heading">{{contact.ContactDetails.value}}</h4> </a> diff --git a/chorem-ui-angular/src/main/webapp/crm/partials/contactDetailsPanel.html b/chorem-ui-angular/src/main/webapp/crm/partials/contactDetailsPanel.html new file mode 100644 index 0000000..c3a44e5 --- /dev/null +++ b/chorem-ui-angular/src/main/webapp/crm/partials/contactDetailsPanel.html @@ -0,0 +1,29 @@ +<div class="panel panel-default"> + <div class="panel-heading clearfix"> + <h3 class="panel-title pull-left">Détails du contact</h3> + <div class="btn-group pull-right visible-xs"> + <a class="btn btn-primary" href="#/contactDetails/{{contactDetails.id}}/edit"> + <i class="fa fa-pencil"></i> + <span>Edit</span> + </a> + </div> + <a class="btn btn-primary pull-right hidden-xs" href="#/contactDetails/{{contactDetails.id}}/edit"> + <i class="fa fa-pencil"></i> + <span>Edit</span> + </a> + </div> + <div class="list-group"> + <div class="list-group-item"> + <label>Name</label> + <h4 class="list-group-item-heading">{{contactDetails.ContactDetails.name}}</h4> + </div> + <div class="list-group-item"> + <label>Type</label> + <h4 class="list-group-item-heading">{{contactDetails.ContactDetails.type}}</h4> + </div> + <div class="list-group-item"> + <label>Value</label> + <h4 class="list-group-item-heading">{{contactDetails.ContactDetails.value}}</h4> + </div> + </div> +</div> \ No newline at end of file diff --git a/chorem-ui-angular/src/main/webapp/crm/partials/notePanel.html b/chorem-ui-angular/src/main/webapp/crm/partials/notePanel.html new file mode 100644 index 0000000..83902a9 --- /dev/null +++ b/chorem-ui-angular/src/main/webapp/crm/partials/notePanel.html @@ -0,0 +1,30 @@ +<div class="panel panel-default"> + <div class="panel-heading clearfix"> + <h3 class="panel-title pull-left">Détails de la note</h3> + <div class="btn-group pull-right visible-xs"> + <a class="btn btn-primary" href="#/crm/note/{{note.id}}/edit"> + <i class="fa fa-pencil"></i> + <span>Edit</span> + </a> + </div> + <a class="btn btn-primary pull-right hidden-xs" href="#/crm/note/{{note.id}}/edit"> + <i class="fa fa-pencil"></i> + <span>Edit</span> + </a> + </div> + <div class="list-group"> + <div class="list-group-item"> + <i class="fa fa-2x fa-comment pull-left"></i> + <label>Date</label> + <h4 class="list-group-item-heading">{{note.Note.date | date : dd/MM/yyy}}</h4> + </div> + <div class="list-group-item"> + <label>Title</label> + <h4 class="list-group-item-heading">{{note.Note.title}}</h4> + </div> + <div class="list-group-item"> + <label>Content</label> + <h4 class="list-group-item-heading">{{note.Note.content}}</h4> + </div> + </div> +</div> \ No newline at end of file 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 865ea64..d980b3b 100644 --- a/chorem-ui-angular/src/main/webapp/crm/partials/notesListCard.html +++ b/chorem-ui-angular/src/main/webapp/crm/partials/notesListCard.html @@ -2,18 +2,18 @@ <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.id}}/notes/add"> + <a class="btn btn-primary" href="#/crm/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.id}}/notes/add"> + <a class="btn btn-primary pull-right hidden-xs" href="#/crm/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.id}}/notes/{{note.id}}"/> + <a class="list-group-item" ng-repeat="note in notes" href="#/crm/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> diff --git a/chorem-ui-angular/src/main/webapp/js/crm/crm.js b/chorem-ui-angular/src/main/webapp/js/crm/crm.js index 73e2e10..488274e 100644 --- a/chorem-ui-angular/src/main/webapp/js/crm/crm.js +++ b/chorem-ui-angular/src/main/webapp/js/crm/crm.js @@ -28,6 +28,18 @@ choremCRM.config( controller: 'CompanyDetailController' }) + .state('crm.companies.viewnote', { + url: '/:companyId/notes/:noteId', + templateUrl: 'crm/partials/notePanel.html', + controller: 'NoteController' + }) + + .state('crm.companies.viewcontactDetails', { + url: '/:companyId/contactDetails/:contactDetailsId', + templateUrl: 'crm/partials/contactDetailsPanel.html', + controller: 'ContactDetailsController' + }) + .state('crm.persons', { url: '/persons', templateUrl: 'crm/partials/personsList.html', 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 f805917..e4efaa3 100644 --- a/chorem-ui-angular/src/main/webapp/js/crm/crmControllers.js +++ b/chorem-ui-angular/src/main/webapp/js/crm/crmControllers.js @@ -293,7 +293,7 @@ choremCRMControllers.controller('PersonDetailController', function ($scope, $htt //get back contact details for the person $scope.updateContactDetails=function(){ if ($scope.personId){ - $http.get('contactDetails?target='+$scope.companyId).success(function(data){ + $http.get('services/v1/ContactDetails?field=target&value='+$scope.personId).success(function(data){ $scope.contactDetails = data; }); } @@ -302,16 +302,16 @@ choremCRMControllers.controller('PersonDetailController', function ($scope, $htt //get back notes for the person $scope.updateNotes=function(){ if ($scope.personId){ - $http.get('notes?target='+$scope.personId).success(function(data){ + $http.get('services/v1/Note?field=target&value='+$scope.personId).success(function(data){ $scope.notes = data; }); } }; - //get back companies for the person + //get back employees for the person $scope.updateEmployees=function(){ - if ($scope.personyId){ - $http.get('employees?person='+$scope.personId).success(function(data){ + if ($scope.personId){ + $http.get('services/v1/Employee?field=company&value='+$scope.personId).success(function(data){ $scope.employees = data; }); } @@ -322,4 +322,34 @@ choremCRMControllers.controller('PersonDetailController', function ($scope, $htt $scope.updateNotes(); $scope.updateEmployees(); +}); + +choremCRMControllers.controller('NoteController', function ($scope, $http, $state){ + + $scope.noteId=$state.params.noteId; + + $scope.updateNote=function(){ + if ($scope.noteId){ + $http.get('services/v1/Note/'+$scope.noteId).success(function(data){ + $scope.note = data; + }); + } + }; + + $scope.updateNote(); +}); + +choremCRMControllers.controller('ContactDetailsController', function ($scope, $http, $state){ + + $scope.contactDetailsId=$state.params.contactDetailsId; + + $scope.updateContactDetails=function(){ + if ($scope.contactDetailsId){ + $http.get('services/v1/ContactDetails/'+$scope.contactDetailsId).success(function(data){ + $scope.contactDetails = data; + }); + } + }; + + $scope.updateContactDetails(); }); \ No newline at end of file -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch chorem-ng in repository chorem. See http://git.chorem.org/chorem.git commit 3ad55b826d05ac05e0562d24eb6c724d4abb3e61 Author: kootox <jean.couteau@gmail.com> Date: Thu Jul 2 17:48:14 2015 +0200 refs #1211 : View person (list nots, contact details and employees) --- .../crm/partials/employeesCompanyListCard.html | 20 ++++++++++++++++++++ .../src/main/webapp/crm/partials/personInfoCard.html | 4 ++-- .../src/main/webapp/crm/partials/personPanel.html | 2 +- 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/chorem-ui-angular/src/main/webapp/crm/partials/employeesCompanyListCard.html b/chorem-ui-angular/src/main/webapp/crm/partials/employeesCompanyListCard.html new file mode 100644 index 0000000..794f0d8 --- /dev/null +++ b/chorem-ui-angular/src/main/webapp/crm/partials/employeesCompanyListCard.html @@ -0,0 +1,20 @@ +<div class="panel panel-default"> + <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="#/persons/{{person.id}}/employees/add"> + <i class="fa fa-plus"></i><span>Ajouter</span> + </a> + </div> + <a class="btn btn-primary pull-right hidden-xs" href="#/persons/{{person.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="#/persons/{{person.id}}/employees/{{employee.id}}"> + <label>{{employee.Employee.description}}</label> + <h4 class="list-group-item-heading">{{employee.Employee.company.Company.name}}</h4> + </a> + </div> +</div> \ No newline at end of file diff --git a/chorem-ui-angular/src/main/webapp/crm/partials/personInfoCard.html b/chorem-ui-angular/src/main/webapp/crm/partials/personInfoCard.html index 59a6fa0..a466faa 100644 --- a/chorem-ui-angular/src/main/webapp/crm/partials/personInfoCard.html +++ b/chorem-ui-angular/src/main/webapp/crm/partials/personInfoCard.html @@ -2,12 +2,12 @@ <div class="panel-heading clearfix"> <h3 class="panel-title pull-left">Détails de la personne</h3> <div class="btn-group pull-right visible-xs"> - <a class="btn btn-primary" href="#/company/{{company.id}}/edit"> + <a class="btn btn-primary" href="#/company/{{person.id}}/edit"> <i class="fa fa-pencil"></i> <span>Edit</span> </a> </div> - <a class="btn btn-primary pull-right hidden-xs" href="#/companies/{{company.id}}/edit"> + <a class="btn btn-primary pull-right hidden-xs" href="#/companies/{{person.id}}/edit"> <i class="fa fa-pencil"></i> <span>Edit</span> </a> diff --git a/chorem-ui-angular/src/main/webapp/crm/partials/personPanel.html b/chorem-ui-angular/src/main/webapp/crm/partials/personPanel.html index 711ab83..85dd786 100644 --- a/chorem-ui-angular/src/main/webapp/crm/partials/personPanel.html +++ b/chorem-ui-angular/src/main/webapp/crm/partials/personPanel.html @@ -8,4 +8,4 @@ <ng-include src="'crm/partials/notesListCard.html'"></ng-include> <!--employees card --> -<ng-include src="'crm/partials/employeesListCard.html'"></ng-include> \ No newline at end of file +<ng-include src="'crm/partials/employeesCompanyListCard.html'"></ng-include> \ No newline at end of file -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm