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>.