This is an automated email from the git hooks/post-receive script. New commit to branch feature/882-angular in repository chorem. See http://git.chorem.org/chorem.git commit 3cd452c834b5556332cef0d36a3d39e894082eee Author: kootox <jean.couteau@gmail.com> Date: Tue Mar 10 16:07:17 2015 +0100 refs #882 : Adds employees CRUD reusing notes and contact details card --- .../webmotion/actions/crm/EmployeeAction.java | 87 ++++++- .../chorem/webmotion/actions/crm/PersonAction.java | 38 +++ chorem-webmotion/src/main/resources/mapping | 13 +- .../main/webapp/WEB-INF/jsp/crm/angularTest.html | 8 + .../jsp/crm/partials/employeeCreateCard.html | 47 ++++ .../WEB-INF/jsp/crm/partials/employeeEditCard.html | 52 +++++ ...mployeesListCard.html => employeeInfoCard.html} | 20 +- .../WEB-INF/jsp/crm/partials/employeePanel.html | 8 + .../jsp/crm/partials/employeesListCard.html | 22 +- chorem-webmotion/src/main/webapp/js/crm.js | 258 +++++++++++++++++---- 10 files changed, 479 insertions(+), 74 deletions(-) diff --git a/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/EmployeeAction.java b/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/EmployeeAction.java index a9a04b1..cae0570 100644 --- a/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/EmployeeAction.java +++ b/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/EmployeeAction.java @@ -2,8 +2,11 @@ package org.chorem.webmotion.actions.crm; import org.chorem.ChoremClient; import org.chorem.entities.Employee; +import org.chorem.entities.EmployeeImpl; +import org.chorem.entities.Note; import org.debux.webmotion.server.WebMotionController; import org.debux.webmotion.server.render.Render; +import org.debux.webmotion.server.render.RenderJson; import org.nuiton.wikitty.query.WikittyQuery; import org.nuiton.wikitty.query.WikittyQueryMaker; import org.nuiton.wikitty.query.WikittyQueryResult; @@ -16,7 +19,7 @@ import java.util.List; */ public class EmployeeAction extends WebMotionController{ - public Render listEmployees(ChoremClient client, String id) { + public Render listEmployeesForCompany(ChoremClient client, String id) { //recuperation des notes WikittyQuery employeesQuery = new WikittyQueryMaker().and() .exteq(Employee.EXT_EMPLOYEE) @@ -25,7 +28,7 @@ public class EmployeeAction extends WebMotionController{ WikittyQueryResult<String> employeesIds = client.findAllByQuery(employeesQuery); - List<Employee> employees = client.restore(Employee.class, employeesIds.getAll(),"Company.person"); + List<Employee> employees = client.restore(Employee.class, employeesIds.getAll(),"Employee.person", "Employee.company"); List<EmployeeDTO> employeeDTOs = new ArrayList<>(); @@ -35,4 +38,84 @@ public class EmployeeAction extends WebMotionController{ return renderJSON(employeeDTOs); } + + public Render listEmployeesForPerson(ChoremClient client, String id) { + //recuperation des notes + WikittyQuery employeesQuery = new WikittyQueryMaker().and() + .exteq(Employee.EXT_EMPLOYEE) + .eq(Employee.FQ_FIELD_EMPLOYEE_PERSON, id) + .end().setLimit(WikittyQuery.MAX); + + WikittyQueryResult<String> employeesIds = client.findAllByQuery(employeesQuery); + + List<Employee> employees = client.restore(Employee.class, employeesIds.getAll(),"Employee.person", "Employee.company"); + + List<EmployeeDTO> employeeDTOs = new ArrayList<>(); + + for (Employee employee:employees){ + employeeDTOs.add(new EmployeeDTO(employee)); + } + + return renderJSON(employeeDTOs); + } + + public Render getEmployee(ChoremClient client, String id) { + Employee employee = client.restore(Employee.class, id, "Employee.person", "Employee.company"); + + EmployeeDTO employeeDTO = new EmployeeDTO(employee); + + return renderJSON(employeeDTO); + } + + public Render updateEmployee(ChoremClient client, String id, EmployeeDTO dto) { + Employee employee = client.restore(Employee.class, id); + + if (dto.getPerson() != null) { + employee.setPerson(dto.getPerson().getWikittyId()); + } else { + employee.setPerson(dto.getPersonId()); + } + + if (dto.getCompany() != null){ + employee.setCompany(dto.getCompany().getWikittyId()); + } else { + employee.setCompany(dto.getCompanyId()); + } + + employee.setDescription(dto.getDescription()); + employee = client.store(employee); + + dto = new EmployeeDTO(employee); + + return renderJSON(dto); + } + + public Render createEmployee(ChoremClient client, EmployeeDTO dto) { + Employee employee = new EmployeeImpl(); + + if (dto.getPerson() != null) { + employee.setPerson(dto.getPerson().getWikittyId()); + } else { + employee.setPerson(dto.getPersonId()); + } + + if (dto.getCompany() != null){ + employee.setCompany(dto.getCompany().getWikittyId()); + } else { + employee.setCompany(dto.getCompanyId()); + } + + employee.setDescription(dto.getDescription()); + employee = client.store(employee); + + dto = new EmployeeDTO(employee); + + return renderJSON(dto); + } + + public Render deleteEmployee(ChoremClient client, String id) { + client.delete(id); + + return renderSuccess(); + } } diff --git a/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/PersonAction.java b/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/PersonAction.java new file mode 100644 index 0000000..b7547ec --- /dev/null +++ b/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/PersonAction.java @@ -0,0 +1,38 @@ +package org.chorem.webmotion.actions.crm; + +import org.chorem.ChoremClient; +import org.chorem.entities.Person; +import org.debux.webmotion.server.WebMotionController; +import org.debux.webmotion.server.render.Render; +import org.nuiton.wikitty.query.WikittyQuery; +import org.nuiton.wikitty.query.WikittyQueryMaker; +import org.nuiton.wikitty.query.WikittyQueryResult; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by couteau on 09/03/15. + */ +public class PersonAction extends WebMotionController { + + public Render listPersons(ChoremClient client) { + + //recuperation des persons + WikittyQuery personsQuery = new WikittyQueryMaker().and() + .exteq(Person.EXT_PERSON) + .end().setLimit(WikittyQuery.MAX); + + WikittyQueryResult<String> personsIds = client.findAllByQuery(personsQuery); + + List<Person> persons = client.restore(Person.class, personsIds.getAll()); + + List<PersonDTO> personDTOs = new ArrayList<>(); + + for (Person person : persons) { + personDTOs.add(new PersonDTO(person)); + } + + return renderJSON(personDTOs); + } +} diff --git a/chorem-webmotion/src/main/resources/mapping b/chorem-webmotion/src/main/resources/mapping index 00f0bd7..3746a97 100644 --- a/chorem-webmotion/src/main/resources/mapping +++ b/chorem-webmotion/src/main/resources/mapping @@ -102,19 +102,26 @@ POST /crm/companies/{id} action:crm.CompaniesAction.updateCompa PUT /crm/companies/add action:crm.CompaniesAction.createCompany DELETE /crm/companies/{id} action:crm.CompaniesAction.deleteCompany -GET /crm/companies/{id}/contactDetails action:crm.ContactDetailsAction.listContactDetails +GET /crm/contactDetails?target={id} action:crm.ContactDetailsAction.listContactDetails PUT /crm/contactDetails/add action:crm.ContactDetailsAction.createContactDetails POST /crm/contactDetails/{id} action:crm.ContactDetailsAction.updateContactDetails GET /crm/contactDetails/{id} action:crm.ContactDetailsAction.getContactDetails DELETE /crm/contactDetails/{id} action:crm.ContactDetailsAction.deleteContactDetails -GET /crm/companies/{id}/notes action:crm.NoteAction.listNotes +GET /crm/notes?target={id} action:crm.NoteAction.listNotes PUT /crm/notes/add action:crm.NoteAction.createNote POST /crm/notes/{id} action:crm.NoteAction.updateNote GET /crm/notes/{id} action:crm.NoteAction.getNote DELETE /crm/notes/{id} action:crm.NoteAction.deleteNote -GET /crm/companies/{id}/employees action:crm.EmployeeAction.listEmployees +GET /crm/employees?company={id} action:crm.EmployeeAction.listEmployeesForCompany +GET /crm/employees?person={id} action:crm.EmployeeAction.listEmployeesForPerson +PUT /crm/employees/add action:crm.EmployeeAction.createEmployee +GET /crm/employees/{id} action:crm.EmployeeAction.getEmployee +POST /crm/employees/{id} action:crm.EmployeeAction.updateEmployee +DELETE /crm/employees/{id} action:crm.EmployeeAction.deleteEmployee + +GET /crm/persons action:crm.PersonAction.listPersons GET /crm/partials/{page} view:crm/partials/{page} diff --git a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/crm/angularTest.html b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/crm/angularTest.html index 4901e75..0b81234 100644 --- a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/crm/angularTest.html +++ b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/crm/angularTest.html @@ -8,10 +8,18 @@ <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.14/angular.min.js"></script> <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.14/angular-route.js"></script> + <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.14/angular-sanitize.js"></script> + <script src="/chorem/js/crm.js"></script> <link href="https://cdnjs.cloudflare.com/ajax/libs/bootcards/1.1.0/css/bootcards-desktop..." rel="stylesheet"> <link href="https://netdna.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css" rel="stylesheet" /> <script src="https://code.jquery.com/jquery-2.1.3.min.js"></script> + + <link href="https://cdnjs.cloudflare.com/ajax/libs/angular-ui-select/0.10.0/select.css" rel="stylesheet" /> + <script src="https://cdnjs.cloudflare.com/ajax/libs/angular-ui-select/0.10.0/select.js"></script> + <link rel="stylesheet" href="http://cdnjs.cloudflare.com/ajax/libs/select2/3.4.5/select2.css"> + + </head> <body> diff --git a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/crm/partials/employeeCreateCard.html b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/crm/partials/employeeCreateCard.html new file mode 100644 index 0000000..f424af3 --- /dev/null +++ b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/crm/partials/employeeCreateCard.html @@ -0,0 +1,47 @@ +<div class="panel panel-default"> + + <div class="panel-heading clearfix"> + <h3 class="panel-title pull-left">Créer un salarié</h3> + <div class="btn-group pull-right"> + <button class="btn btn-danger" ng-click="cancel()"> + <i class="fa fa-times"></i> + Annuler + </button> + <button class="btn btn-success" ng-click="saveEmployee()"> + <i class="fa fa-check"></i> + Sauver + </button> + </div> + </div> + + <div class="modal-body"> + <form class="form-horizontal"> + <div class="form-group"> + <label class="col-xs-3 control-label">Nom</label> + <div class="col-xs-9"> + <ui-select ng-model="employee.person" theme="select2" class="col-xs-9"> + <ui-select-match placeholder="Select a person in the list or search his name...">{{$select.selected.firstName}} {{$select.selected.lastName}}</ui-select-match> + <ui-select-choices repeat="person in persons | propsFilter: {firstName: $select.search, lastName: $select.search}"> + <span ng-bind-html="''+person.firstName | highlight: $select.search"></span> + <span ng-bind-html="''+person.lastName | highlight: $select.search"></span> + </ui-select-choices> + </ui-select> + </div> + </div> + + <div class="form-group"> + <label class="col-xs-3 control-label">Description</label> + <div class="col-xs-9"> + <input type="text" class="form-control" ng-model="employee.description"> + </div> + </div> + + </form> + </div> + + <div class="panel-footer"> + </div> +</div> + + + diff --git a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/crm/partials/employeeEditCard.html b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/crm/partials/employeeEditCard.html new file mode 100644 index 0000000..9dfe317 --- /dev/null +++ b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/crm/partials/employeeEditCard.html @@ -0,0 +1,52 @@ +<div class="panel panel-default"> + + <div class="panel-heading clearfix"> + <h3 class="panel-title pull-left">Éditer un salarié</h3> + <div class="btn-group pull-right"> + <button class="btn btn-danger" ng-click="cancel()"> + <i class="fa fa-times"></i> + Annuler + </button> + <button class="btn btn-success" ng-click="saveEmployee()"> + <i class="fa fa-check"></i> + Sauver + </button> + </div> + </div> + + <div class="modal-body"> + <form class="form-horizontal"> + <div class="form-group"> + <label class="col-xs-3 control-label">Nom</label> + <div class="col-xs-9"> + <ui-select ng-model="employee.person" theme="select2" class="col-xs-9"> + <ui-select-match placeholder="Select a person in the list or search his name...">{{$select.selected.firstName}} {{$select.selected.lastName}}</ui-select-match> + <ui-select-choices repeat="person in persons | propsFilter: {firstName: $select.search, lastName: $select.search}" + value="{{$select.selected.wikittyId}}"> + <span ng-bind-html="''+person.firstName | highlight: $select.search"></span> + <span ng-bind-html="''+person.lastName | highlight: $select.search"></span> + </ui-select-choices> + </ui-select> + </div> + </div> + + <div class="form-group"> + <label class="col-xs-3 control-label">Description</label> + <div class="col-xs-9"> + <input type="text" class="form-control" ng-model="employee.description"> + </div> + </div> + + </form> + </div> + + <div class="panel-footer"> + <button class="btn btn-danger btn-block" ng-click="deleteEmployee()"> + <i class="fa fa-trash-o"></i> + Supprimer le salarié + </button> + </div> +</div> + + + diff --git a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/crm/partials/employeesListCard.html b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/crm/partials/employeeInfoCard.html similarity index 51% copy from chorem-webmotion/src/main/webapp/WEB-INF/jsp/crm/partials/employeesListCard.html copy to chorem-webmotion/src/main/webapp/WEB-INF/jsp/crm/partials/employeeInfoCard.html index 6a0bc09..d3cc23e 100644 --- a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/crm/partials/employeesListCard.html +++ b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/crm/partials/employeeInfoCard.html @@ -1,27 +1,27 @@ <div class="panel panel-default"> <div class="panel-heading clearfix"> - <h3 class="panel-title pull-left">Employés</h3> + <h3 class="panel-title pull-left">Détails du salarié</h3> <div class="btn-group pull-right visible-xs"> - <a class="btn btn-primary" href="#" - data-toggle="modal" - data-target="#editModal"> + <a class="btn btn-primary" href="#"> <i class="fa fa-pencil"></i> <span>Edit</span> </a> </div> - <a class="btn btn-primary pull-right hidden-xs" href="#" - data-toggle="modal" - data-target="#editModal"> + <a class="btn btn-primary pull-right hidden-xs" href="#/companies/{{company.wikittyId}}/employees/{{employee.wikittyId}}/edit"> <i class="fa fa-pencil"></i> <span>Edit</span> </a> </div> <div class="list-group"> - <div class="list-group-item" - ng-repeat="employee in employees"> - <label>{{note.date}}</label> + <div class="list-group-item"> + <i class="fa fa-2x fa-file-text-o pull-left"></i> + <label>Personne</label> <h4 class="list-group-item-heading">{{employee.person.firstName}} {{employee.person.lastName}}</h4> </div> + <div class="list-group-item"> + <label>Description</label> + <h4 class="list-group-item-heading">{{employee.description}}</h4> + </div> </div> <div class="panel-footer"> <small class="pull-left"> </small> diff --git a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/crm/partials/employeePanel.html b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/crm/partials/employeePanel.html new file mode 100644 index 0000000..a98ac70 --- /dev/null +++ b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/crm/partials/employeePanel.html @@ -0,0 +1,8 @@ +<!-- employee info card --> +<ng-include src="'partials/employeeInfoCard.html'"></ng-include> + +<!-- contact details card --> +<ng-include src="'partials/contactDetailsListCard.html'"></ng-include> + +<!-- notes card --> +<ng-include src="'partials/notesListCard.html'"></ng-include> \ No newline at end of file diff --git a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/crm/partials/employeesListCard.html b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/crm/partials/employeesListCard.html index 6a0bc09..eb2f840 100644 --- a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/crm/partials/employeesListCard.html +++ b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/crm/partials/employeesListCard.html @@ -2,26 +2,20 @@ <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="#" - data-toggle="modal" - data-target="#editModal"> - <i class="fa fa-pencil"></i> - <span>Edit</span> + <a class="btn btn-primary" href="#/companies/{{company.wikittyId}}/employees/add"> + <i class="fa fa-plus"></i><span>Ajouter</span> </a> </div> - <a class="btn btn-primary pull-right hidden-xs" href="#" - data-toggle="modal" - data-target="#editModal"> - <i class="fa fa-pencil"></i> - <span>Edit</span> + <a class="btn btn-primary pull-right hidden-xs" href="#/companies/{{company.wikittyId}}/employees/add"> + <i class="fa fa-plus"></i><span>Ajouter</span> </a> </div> <div class="list-group"> - <div class="list-group-item" - ng-repeat="employee in employees"> - <label>{{note.date}}</label> + <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> - </div> + </a> </div> <div class="panel-footer"> <small class="pull-left"> </small> diff --git a/chorem-webmotion/src/main/webapp/js/crm.js b/chorem-webmotion/src/main/webapp/js/crm.js index 5d415b1..0859bc2 100644 --- a/chorem-webmotion/src/main/webapp/js/crm.js +++ b/chorem-webmotion/src/main/webapp/js/crm.js @@ -1,4 +1,4 @@ -var crmTest = angular.module('crmTest', ['ngRoute']); +var crmTest = angular.module('crmTest', ['ngRoute','ui.select','ngSanitize']); crmTest.config(['$routeProvider', function($routeProvider){ @@ -42,9 +42,53 @@ crmTest.config(['$routeProvider', when('/companies/:companyId/contactDetails/:contactDetailsId/edit', { templateUrl:'partials/contactDetailsEditCard.html', - controller:'ContactDetailsEditController'}); + controller:'ContactDetailsEditController'}). + + when('/companies/:companyId/employees/add', { + templateUrl:'partials/employeeCreateCard.html', + controller:'EmployeeCreateController'}). + + when('/companies/:companyId/employees/:employeeId', { + templateUrl:'partials/employeePanel.html', + controller:'EmployeeDetailController'}). + + when('/companies/:companyId/employees/:employeeId/edit', { + templateUrl:'partials/employeeEditCard.html', + controller:'EmployeeEditController'}); }]); +/**For select 2 filtering -> OR between search terms instead of AND**/ +crmTest.filter('propsFilter', function() { + return function(items, props) { + var out = []; + + if (angular.isArray(items)) { + items.forEach(function(item) { + var itemMatches = false; + + var keys = Object.keys(props); + for (var i = 0; i < keys.length; i++) { + var prop = keys[i]; + var text = props[prop].toLowerCase(); + if (item[prop].toString().toLowerCase().indexOf(text) !== -1) { + itemMatches = true; + break; + } + } + + if (itemMatches) { + out.push(item); + } + }); + } else { + // Let the output be the input untouched + out = items; + } + + return out; + } +}); + //Should use heritage for next main list controllers crmTest.controller('CompanyListController', function ($scope, $http, $location, $route, $routeParams) { @@ -56,6 +100,12 @@ crmTest.controller('CompanyListController', function ($scope, $http, $location, $scope.selectedItem=$scope.items[0]; + $scope.targetId=""; + + $scope.setTargetId=function(targetId){ + $scope.targetId=targetId; + } + $scope.selectItem=function(selectedCompany){ $scope.selectedItem = selectedCompany; }; @@ -135,10 +185,12 @@ crmTest.controller('CompanyDetailController', function ($scope, $http, $routePar $scope.company=$scope.selectedItem; + $scope.setTargetId($scope.selectedItem.wikittyId); + //get back contact details for the company $scope.updateContactDetails=function(){ if ($scope.company){ - $http.get('companies/'+$scope.company.wikittyId+"/contactDetails").success(function(data){ + $http.get('contactDetails?target='+$scope.company.wikittyId).success(function(data){ $scope.contactDetails = data; }); } @@ -147,7 +199,7 @@ crmTest.controller('CompanyDetailController', function ($scope, $http, $routePar //get back notes for the company $scope.updateNotes=function(){ if ($scope.company){ - $http.get('companies/'+$scope.company.wikittyId+"/notes").success(function(data){ + $http.get('notes?target='+$scope.company.wikittyId).success(function(data){ $scope.notes = data; }); } @@ -156,7 +208,7 @@ crmTest.controller('CompanyDetailController', function ($scope, $http, $routePar //get back employees for the company $scope.updateEmployees=function(){ if ($scope.company){ - $http.get('companies/'+$scope.company.wikittyId+"/employees").success(function(data){ + $http.get('employees?company='+$scope.company.wikittyId).success(function(data){ $scope.employees = data; }); } @@ -168,7 +220,7 @@ crmTest.controller('CompanyDetailController', function ($scope, $http, $routePar }); -crmTest.controller('CompanyEditController', function ($scope, $http, $routeParams, $location, $route) { +crmTest.controller('CompanyEditController', function ($scope, $http, $routeParams, $window) { //copy selectedItem to not modify the parent one $scope.company=$scope.selectedItem; @@ -188,14 +240,12 @@ crmTest.controller('CompanyEditController', function ($scope, $http, $routeParam $scope.$parent.selectedCompany=data; //then reload - $location.path('companies/'+$scope.selectedItem.wikittyId); - $route.reload(); + $window.history.back(); }); }; $scope.cancel = function(){ - $location.path('companies/'+$scope.selectedItem.wikittyId); - $route.reload(); + $window.history.back(); } $scope.deleteCompany = function(){ @@ -205,15 +255,15 @@ crmTest.controller('CompanyEditController', function ($scope, $http, $routeParam $scope.deleteItem($scope.selectedItem); $scope.$parent.selectedItem=''; - $location.path('companies'); - $route.reload(); + $window.history.back(); + $window.history.back(); }); } } }); -crmTest.controller('CompanyCreateController', function ($scope, $http, $location, $route) { +crmTest.controller('CompanyCreateController', function ($scope, $http, $window) { $scope.saveCompany = function(){ $http({ @@ -228,26 +278,24 @@ crmTest.controller('CompanyCreateController', function ($scope, $http, $location $scope.addItem(data); $scope.$parent.selectedItem=data; - $location.path('companies/'+data); - $route.reload(); + $window.history.back(); }); }; $scope.cancel = function(){ - $location.path('companies/'); - $route.reload(); + $window.history.back(); } }); -crmTest.controller('NoteCreateController', function ($scope, $http, $location, $route) { +crmTest.controller('NoteCreateController', function ($scope, $http, $window) { $scope.company = $scope.selectedItem; //$scope.note.target = $scope.company.wikittyId; $scope.saveNote = function(){ - $scope.note.target=$scope.company.wikittyId; + $scope.note.target=$scope.targetId; $http({ method : 'PUT', url : 'notes/add', @@ -255,14 +303,12 @@ crmTest.controller('NoteCreateController', function ($scope, $http, $location, $ headers : { 'Content-Type': 'application/x-www-form-urlencoded' } // set the headers so angular passing info as form data (not request payload) }) .success(function(data) { - $location.path('companies/'+data); - $route.reload(); + $window.history.back(); }); }; $scope.cancel = function(){ - $location.path('companies/'); - $route.reload(); + $window.history.back(); } }); @@ -277,7 +323,7 @@ crmTest.controller('NoteDetailController', function ($scope, $http, $routeParams }); -crmTest.controller('NoteEditController', function ($scope, $http, $routeParams, $location, $route) { +crmTest.controller('NoteEditController', function ($scope, $http, $routeParams, $window) { //copy selectedItem to not modify the parent one $scope.company=$scope.selectedItem; @@ -295,35 +341,32 @@ crmTest.controller('NoteEditController', function ($scope, $http, $routeParams, headers : { 'Content-Type': 'application/x-www-form-urlencoded' } // set the headers so angular passing info as form data (not request payload) }) .success(function(data) { - //then reload - $location.path('companies/'+$scope.selectedItem.wikittyId); - $route.reload(); + $window.history.back(); }); }; $scope.cancel = function(){ - $location.path('companies/'+$scope.selectedItem.wikittyId); - $route.reload(); + $window.history.back(); } $scope.deleteNote = function(){ if(confirm('Are you sure you want to delete?')){ $http.delete('notes/'+$scope.note.wikittyId).success(function(data){ - $location.path('companies'); - $route.reload(); + $window.history.back(); + $window.history.back(); }); } } }); -crmTest.controller('ContactDetailsCreateController', function ($scope, $http, $location, $route) { +crmTest.controller('ContactDetailsCreateController', function ($scope, $http, $window) { $scope.company = $scope.selectedItem; $scope.saveContactDetails = function(){ - $scope.contactDetails.target=$scope.company.wikittyId; + $scope.contactDetails.target=$scope.targetId; $http({ method : 'PUT', url : 'contactDetails/add', @@ -331,14 +374,12 @@ crmTest.controller('ContactDetailsCreateController', function ($scope, $http, $l headers : { 'Content-Type': 'application/x-www-form-urlencoded' } // set the headers so angular passing info as form data (not request payload) }) .success(function(data) { - $location.path('companies/'+data); - $route.reload(); + $window.history.back(); }); }; $scope.cancel = function(){ - $location.path('companies/'); - $route.reload(); + $window.history.back(); } }); @@ -353,7 +394,7 @@ crmTest.controller('ContactDetailsDetailController', function ($scope, $http, $r }); -crmTest.controller('ContactDetailsEditController', function ($scope, $http, $routeParams, $location, $route) { +crmTest.controller('ContactDetailsEditController', function ($scope, $http, $routeParams, $window) { //copy selectedItem to not modify the parent one $scope.company=$scope.selectedItem; @@ -371,25 +412,152 @@ crmTest.controller('ContactDetailsEditController', function ($scope, $http, $rou headers : { 'Content-Type': 'application/x-www-form-urlencoded' } // set the headers so angular passing info as form data (not request payload) }) .success(function(data) { - //then reload - $location.path('companies/'+$scope.selectedItem.wikittyId); - $route.reload(); + $window.history.back(); }); }; $scope.cancel = function(){ - $location.path('companies/'+$scope.selectedItem.wikittyId); - $route.reload(); + $window.history.back(); } $scope.deleteContactDetails = function(){ if(confirm('Are you sure you want to delete?')){ $http.delete('contactDetails/'+$scope.contactDetails.wikittyId).success(function(data){ - $location.path('companies'); - $route.reload(); + $window.history.back(); + $window.history.back(); + }); + } + } + +}); + +crmTest.controller('EmployeeDetailController', function ($scope, $http, $routeParams){ + + $scope.company=$scope.selectedItem; + + $scope.setTargetId($routeParams.employeeId); + + $http.get('employees/'+$routeParams.employeeId).success(function(data){ + $scope.employee = data; + }); + + //get back contact details for the employee + $scope.updateContactDetails=function(){ + if ($scope.company){ + $http.get('contactDetails?target='+$routeParams.employeeId).success(function(data){ + $scope.contactDetails = data; + }); + } + }; + + //get back notes for the employee + $scope.updateNotes=function(){ + if ($scope.company){ + $http.get('notes?target='+$routeParams.employeeId).success(function(data){ + $scope.notes = data; + }); + } + }; + + $scope.updateContactDetails(); + $scope.updateNotes(); + +}); + +crmTest.controller('EmployeeEditController', function ($scope, $http, $routeParams, $window) { + + //copy selectedItem to not modify the parent one + $scope.company=$scope.selectedItem; + + $scope.updateSelect2Values = function(){ + if($scope.persons && $scope.employee){ + for(index in $scope.persons){ + var person = $scope.persons[index]; + if (person.wikittyId===$scope.employee.personId){ + $scope.person=person; + } + } + } + }; + + $http.get('employees/'+$routeParams.employeeId).success(function(data){ + $scope.employee = data; + $scope.updateSelect2Values(); + }); + + //get all companies + $http.get('companies').success(function(data){ + $scope.companies = data; + }); + + //get all persons + $http.get('persons').success(function(data){ + $scope.persons = data; + $scope.updateSelect2Values(); + }); + + $scope.saveEmployee = function(){ + + $http({ + method : 'POST', + url : 'employees/'+$scope.employee.wikittyId, + data : $.param($scope.employee), // pass in data as strings + headers : { 'Content-Type': 'application/x-www-form-urlencoded' } // set the headers so angular passing info as form data (not request payload) + }) + .success(function(data) { + $window.history.back(); + }); + }; + + $scope.cancel = function(){ + $window.history.back(); + } + + $scope.deleteEmployee = function(){ + if(confirm('Are you sure you want to delete?')){ + $http.delete('employees/'+$scope.employee.wikittyId).success(function(data){ + + $window.history.back(); + $window.history.back(); }); } } }); + +crmTest.controller('EmployeeCreateController', function ($scope, $http, $window) { + + $scope.company = $scope.selectedItem; + + $scope.employee={}; + + //get all companies + $http.get('companies').success(function(data){ + $scope.companies = data; + }); + + //get all persons + $http.get('persons').success(function(data){ + $scope.persons = data; + }); + + $scope.saveEmployee = function(){ + + $scope.employee.company = $scope.company; + + $http({ + method : 'PUT', + url : 'employees/add', + data : $.param($scope.employee), // pass in data as strings + headers : { 'Content-Type': 'application/x-www-form-urlencoded' } // set the headers so angular passing info as form data (not request payload) + }) + .success(function(data) { + $window.history.back(); + }); + }; + + $scope.cancel = function(){ + $window.history.back(); + } +}); \ No newline at end of file -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.