- Chorem-commits - mailman.cloud.codelutin.com

branch chorem-ng updated (1b5889e -> 5bf6256)
by chorem.org scm 27 Mar '15

27 Mar '15

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 1b5889e Fix too quick angularjs update -> copy ui-date into sources and allowGlobals on salesFunnel module new 5bf6256 create new UI module : chorem-ui-angular The 1 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 5bf6256f1cd28cd836c95e6c0e82e0b4f6c3e3bb Author: Yannick Martel <yannick.martel(a)gmail.com> Date: Fri Mar 27 17:32:30 2015 +0100 create new UI module : chorem-ui-angular Summary of changes: LICENSE.txt => chorem-ui-angular/LICENSE.txt | 0 README.txt => chorem-ui-angular/README.txt | 0 chorem-ui-angular/pom.xml | 85 ++++++++++++++++++++++ .../src/main/webapp/WEB-INF/web.xml | 11 +-- pom.xml | 1 + 5 files changed, 90 insertions(+), 7 deletions(-) copy LICENSE.txt => chorem-ui-angular/LICENSE.txt (100%) copy README.txt => chorem-ui-angular/README.txt (100%) create mode 100644 chorem-ui-angular/pom.xml copy {chorem-webmotion => chorem-ui-angular}/src/main/webapp/WEB-INF/web.xml (79%) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch chorem-ng created (now 1b5889e)
by chorem.org scm 27 Mar '15

27 Mar '15

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 at 1b5889e Fix too quick angularjs update -> copy ui-date into sources and allowGlobals on salesFunnel module No new revisions were added by this update. -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

branch jsonize_wikitty updated (7a81dca -> 3f01d6a)
by chorem.org scm 27 Mar '15

27 Mar '15

This is an automated email from the git hooks/post-receive script. New change to branch jsonize_wikitty in repository chorem. See http://git.chorem.org/chorem.git from 7a81dca add GSON Adapter for Wikitty BusinessEntity new c548f7f add GSON Adapter for Wikitty BusinessEntity new 0d78c0c Merge branch 'jsonize_wikitty' of https://git.chorem.org/chorem into jsonize_wikitty new 3f01d6a complete Adapter for Wikitty BusinessEntity 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 3f01d6ae5dc6b6db554973298cdaba08be8f68a3 Author: Yannick Martel <yannick.martel(a)gmail.com> Date: Fri Mar 27 17:04:09 2015 +0100 complete Adapter for Wikitty BusinessEntity commit 0d78c0c1b9d968ca2c7c4b7622392225e1ecf70b Merge: c548f7f 7a81dca Author: Yannick Martel <yannick.martel(a)gmail.com> Date: Thu Mar 26 17:29:02 2015 +0100 Merge branch 'jsonize_wikitty' of https://git.chorem.org/chorem into jsonize_wikitty commit c548f7fb18225ca47206598c0c34ca44dda40bd1 Author: Yannick Martel <yannick.martel(a)gmail.com> Date: Thu Mar 26 12:16:23 2015 +0100 add GSON Adapter for Wikitty BusinessEntity Summary of changes: .../src/main/java/org/chorem/webmotion/injector/InjectorListener.java | 4 +++- .../test/java/org/chorem/webmotion/converters/JsonConverterTest.java | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 3

branch develop updated (3fa1595 -> 1b5889e)
by chorem.org scm 26 Mar '15

26 Mar '15

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository chorem. See http://git.chorem.org/chorem.git from 3fa1595 is expense account page cuter ? new 1b5889e Fix too quick angularjs update -> copy ui-date into sources and allowGlobals on salesFunnel module The 1 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 1b5889ed149f5f841285f36b758679c406ea3523 Author: kootox <jean.couteau(a)gmail.com> Date: Thu Mar 26 14:45:01 2015 +0100 Fix too quick angularjs update -> copy ui-date into sources and allowGlobals on salesFunnel module Summary of changes: .../WEB-INF/jsp/salesReports/salesFunnel.jsp | 4 +- chorem-webmotion/src/main/webapp/js/salesFunnel.js | 4 +- chorem-webmotion/src/main/webapp/js/ui-date.js | 157 +++++++++++++++++++++ 3 files changed, 162 insertions(+), 3 deletions(-) create mode 100644 chorem-webmotion/src/main/webapp/js/ui-date.js -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch jsonize_wikitty created (now 7a81dca)
by chorem.org scm 26 Mar '15

26 Mar '15

This is an automated email from the git hooks/post-receive script. New change to branch jsonize_wikitty in repository chorem. See http://git.chorem.org/chorem.git at 7a81dca add GSON Adapter for Wikitty BusinessEntity This branch includes the following new commits: new 7a81dca add GSON Adapter for Wikitty BusinessEntity The 1 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 7a81dca242021b3cf7098872568e5a441bcb3637 Author: Yannick Martel <yannick.martel(a)gmail.com> Date: Thu Mar 26 12:16:23 2015 +0100 add GSON Adapter for Wikitty BusinessEntity -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch feature/882-angular created (now 89ebbb7)
by chorem.org scm 19 Mar '15

19 Mar '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/882-angular in repository chorem. See http://git.chorem.org/chorem.git at 89ebbb7 refs #882 : Add date picker on invoices This branch includes the following new commits: new e0f1a75 refs #882 : Initiate CRM using bootcards and angular. Working nice on easy stuff. new abacf7d refs #882 : Working companies CRUD, but parasite refreshs to be dealt with new 5cd6b7a refs #882 : Better refresh/requests management for company CRUD new 9c120d2 refs #882 : filter case insensitive new 56dd045 refs #882 : Now got notes and employees displayed on company detail panel new 2cc12ef refs #882 : Note CRUD on companies screen new b74fe5c refs #882 : ContactDetails CRUD from company info new 3cd452c refs #882 : Adds employees CRUD reusing notes and contact details card new a5f63dc refs #882 : Remove useless footers new a258442 refs #882 : deal with invoices on companies new 89ebbb7 refs #882 : Add date picker on invoices The 11 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 89ebbb7927cf0c5f74baf123ca2ebd8ab3cb97c4 Author: kootox <jean.couteau(a)gmail.com> Date: Thu Mar 19 10:57:09 2015 +0100 refs #882 : Add date picker on invoices commit a258442dae7587b56c50d91aa9a7f2a2c57db361 Author: kootox <jean.couteau(a)gmail.com> Date: Wed Mar 11 16:17:35 2015 +0100 refs #882 : deal with invoices on companies commit a5f63dcaecb0f1334ef6b907990da330e1a681b7 Author: kootox <jean.couteau(a)gmail.com> Date: Tue Mar 10 16:43:59 2015 +0100 refs #882 : Remove useless footers commit 3cd452c834b5556332cef0d36a3d39e894082eee Author: kootox <jean.couteau(a)gmail.com> Date: Tue Mar 10 16:07:17 2015 +0100 refs #882 : Adds employees CRUD reusing notes and contact details card commit b74fe5c6af1644cbd227abb4871bc5419e86923e Author: kootox <jean.couteau(a)gmail.com> Date: Thu Mar 5 15:51:04 2015 +0100 refs #882 : ContactDetails CRUD from company info commit 2cc12ef17d27a63e582cf9d051e14bed98fba930 Author: kootox <jean.couteau(a)gmail.com> Date: Thu Mar 5 14:49:02 2015 +0100 refs #882 : Note CRUD on companies screen commit 56dd045646370eb1ac0a2c82bc8674944939fcb1 Author: kootox <jean.couteau(a)gmail.com> Date: Wed Mar 4 16:02:44 2015 +0100 refs #882 : Now got notes and employees displayed on company detail panel commit 9c120d28bcce1ed8e31ec74b5e868b5aac560283 Author: kootox <jean.couteau(a)gmail.com> Date: Wed Mar 4 14:50:48 2015 +0100 refs #882 : filter case insensitive commit 5cd6b7a7949d23fbddf55cf9039fca2f5173cf9d Author: kootox <jean.couteau(a)gmail.com> Date: Wed Mar 4 14:33:29 2015 +0100 refs #882 : Better refresh/requests management for company CRUD commit abacf7db1aa21d2a75413ec193a01e02abea47df Author: kootox <jean.couteau(a)gmail.com> Date: Wed Mar 4 12:20:57 2015 +0100 refs #882 : Working companies CRUD, but parasite refreshs to be dealt with commit e0f1a75ecab7601c6e35b02d15d0424fc11b4974 Author: kootox <jean.couteau(a)gmail.com> Date: Tue Mar 3 11:19:00 2015 +0100 refs #882 : Initiate CRM using bootcards and angular. Working nice on easy stuff. -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 10

01/11: refs #882 : Initiate CRM using bootcards and angular. Working nice on easy stuff.
by chorem.org scm 19 Mar '15

19 Mar '15

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 e0f1a75ecab7601c6e35b02d15d0424fc11b4974 Author: kootox <jean.couteau(a)gmail.com> Date: Tue Mar 3 11:19:00 2015 +0100 refs #882 : Initiate CRM using bootcards and angular. Working nice on easy stuff. --- .../webmotion/actions/crm/CompaniesAction.java | 38 ++++ .../chorem/webmotion/actions/crm/CompanyDTO.java | 45 +++++ .../actions/crm/ContactDetailsAction.java | 38 ++++ .../webmotion/actions/crm/ContactDetailsDTO.java | 54 ++++++ chorem-webmotion/src/main/resources/mapping | 4 + .../main/webapp/WEB-INF/jsp/crm/angularTest.html | 192 +++++++++++++++++++++ chorem-webmotion/src/main/webapp/js/crm.js | 72 ++++++++ 7 files changed, 443 insertions(+) diff --git a/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/CompaniesAction.java b/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/CompaniesAction.java new file mode 100644 index 0000000..3ff8f91 --- /dev/null +++ b/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/CompaniesAction.java @@ -0,0 +1,38 @@ +package org.chorem.webmotion.actions.crm; + +import org.chorem.ChoremClient; +import org.chorem.entities.Company; +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 02/03/15. + */ +public class CompaniesAction extends WebMotionController { + + public Render listCompanies(ChoremClient client) { + //recuperation des contact details + WikittyQuery companiesQuery = new WikittyQueryMaker().and() + .exteq(Company.EXT_COMPANY) + .end().setLimit(WikittyQuery.MAX); + + WikittyQueryResult<Company> companies = + client.findAllByQuery(Company.class, + companiesQuery); + + List<CompanyDTO> companyDTOs = new ArrayList<>(); + + for (Company company:companies.getAll()){ + companyDTOs.add(new CompanyDTO(company)); + } + + return renderJSON(companyDTOs); + } + +} diff --git a/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/CompanyDTO.java b/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/CompanyDTO.java new file mode 100644 index 0000000..7e57379 --- /dev/null +++ b/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/CompanyDTO.java @@ -0,0 +1,45 @@ +package org.chorem.webmotion.actions.crm; + +import org.chorem.entities.Company; + +/** + * Created by couteau on 02/03/15. + */ +public class CompanyDTO { + + protected String name; + + protected String wikittyId; + + protected String type; + + public CompanyDTO (Company company) { + this.name = company.getName(); + this.type = company.getType(); + this.wikittyId = company.getWikittyId(); + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getWikittyId() { + return wikittyId; + } + + public void setWikittyId(String wikittyId) { + this.wikittyId = wikittyId; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } +} diff --git a/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/ContactDetailsAction.java b/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/ContactDetailsAction.java new file mode 100644 index 0000000..ae52c43 --- /dev/null +++ b/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/ContactDetailsAction.java @@ -0,0 +1,38 @@ +package org.chorem.webmotion.actions.crm; + +import org.chorem.ChoremClient; +import org.chorem.entities.ContactDetails; +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 02/03/15. + */ +public class ContactDetailsAction extends WebMotionController { + + public Render listContactDetails(ChoremClient client, String id) { + //recuperation des contact details + WikittyQuery contactDetailsQuery = new WikittyQueryMaker().and() + .exteq(ContactDetails.EXT_CONTACTDETAILS) + .eq(ContactDetails.FQ_FIELD_CONTACTDETAILS_TARGET, id) + .end().setLimit(WikittyQuery.MAX); + + WikittyQueryResult<ContactDetails> contacts = + client.findAllByQuery(ContactDetails.class, + contactDetailsQuery); + + List<ContactDetailsDTO> contactDTOs = new ArrayList<>(); + + for (ContactDetails contact:contacts.getAll()){ + contactDTOs.add(new ContactDetailsDTO(contact)); + } + + return renderJSON(contactDTOs); + } +} diff --git a/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/ContactDetailsDTO.java b/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/ContactDetailsDTO.java new file mode 100644 index 0000000..1ad09eb --- /dev/null +++ b/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/ContactDetailsDTO.java @@ -0,0 +1,54 @@ +package org.chorem.webmotion.actions.crm; + +import org.chorem.entities.ContactDetails; + +/** + * Created by couteau on 02/03/15. + */ +public class ContactDetailsDTO { + protected String name; + protected String type; + protected String value; + protected String target; + protected String wikittyId; + + public ContactDetailsDTO(ContactDetails contact) { + this.name = contact.getName(); + this.value = contact.getValue(); + this.type = contact.getType(); + this.target = contact.getTarget(); + this.wikittyId = contact.getWikittyId(); + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public String getTarget() { + return target; + } + + public void setTarget(String target) { + this.target = target; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} diff --git a/chorem-webmotion/src/main/resources/mapping b/chorem-webmotion/src/main/resources/mapping index e1bf470..0fd0413 100644 --- a/chorem-webmotion/src/main/resources/mapping +++ b/chorem-webmotion/src/main/resources/mapping @@ -18,6 +18,7 @@ default.render=org.debux.webmotion.server.render.DefaultRender * /hr/employeeEdit/json/* DecoratorFilter.decorate wmDecoratorNo=true * /ascii/* DecoratorFilter.decorate wmDecoratorNo=true * /rest/* DecoratorFilter.decorate wmDecoratorNo=true +* /crm/* DecoratorFilter.decorate wmDecoratorNo=true GET /* DecoratorFilter.decorate * /* AuthenticationFilter.check ##### @@ -93,6 +94,9 @@ GET /* DecoratorFilter.decorate * /crm/account/{id} action:crm.AccountAction.view * /crm/quotation/edit/{id} action:crm.QuotationAction.edit * /crm/export action:crm.ExportAction.exportContactBase +GET /crm/companies.html view:crm/angularTest.html +GET /crm/companies action:crm.CompaniesAction.listCompanies +GET /crm/companies/{id}/contactDetails action:crm.ContactDetailsAction.listContactDetails GET /rest/project/projects?page={page}&count={count} action:project.ProjectsAction.findAllProjects page=1,count=10 GET /project/projects view:projects/projects.jsp 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 new file mode 100644 index 0000000..5624d4a --- /dev/null +++ b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/crm/angularTest.html @@ -0,0 +1,192 @@ +<!DOCTYPE html> +<html lang="en" ng-app="crmTest"> + +<head> + <meta charset="utf-8"> + <title>CRM Bootcards Angular test</title> + <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap.min.css"> + + <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.14/angular.min.js"></script> + <script src="/chorem/js/crm.js"></script> + <link href="https://cdnjs.cloudflare.com/ajax/libs/bootcards/1.1.0/css/bootcards-deskto…" 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> +</head> + +<body> + +<div class="container bootcards-container" id="main"> + <div class="row"> + <div class="col-sm-6 bootcards-list" id="list" ng-controller="CompanyListController"> + <div class="panel panel-default"> + <div class="panel-body"> + <div class="search-form"> + <div class="row"> + <div class="col-xs-9"> + <div class="form-group"> + <input type="text" class="form-control" placeholder="Search Companies..." + ng-model="search" ng-change="updateList()"> + <i class="fa fa-search"></i> + </div> + </div> + <div class="col-xs-3"> + <a class="btn btn-primary btn-block" href="#"> + <i class="fa fa-plus"></i> + <span>Add</span> + </a> + </div> + </div> + </div> + </div> + + <div class="list-group"> + <a class="list-group-item" href="#" + ng-repeat="company in filteredCompanies | orderBy:'name' " + ng-class="{'active':isCompanySelected(company)}" + ng-click="setCompanySelected(company)"> + <i class="fa fa-3x fa-building-o pull-left"></i> + <h4 class="list-group-item-heading">{{company.name}}</h4> + <p class="list-group-item-text">{{company.type}} </p> + </a> + + </div> + + <div class="panel-footer"> + <small class="pull-left"> </small> + </div> + + </div> + + </div> + + <div class="col-sm-6 bootcards-cards" id="listDetails" ng-controller="CompanyDetailsController"> +  + <div id="companyCard"> + + <div class="panel panel-default"> + <div class="panel-heading clearfix"> + <h3 class="panel-title pull-left">Détails de la société</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> + </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> + </div> + <div class="list-group"> + <div class="list-group-item"> + <i class="fa fa-2x fa-building-o pull-left"></i> + <label>Nom</label> + <h4 class="list-group-item-heading">{{company.name}}</h4> + </div> + <div class="list-group-item"> + <label>Type</label> + <h4 class="list-group-item-heading">{{company.type}}</h4> + </div> + </div> + <div class="panel-footer"> + <small class="pull-left"> </small> + </div> + </div> + + </div> + +  + <div id="contactDetailsListCard"> + + <div class="panel panel-default"> + <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="#" + data-toggle="modal" + data-target="#editModal"> + <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"> + <i class="fa fa-pencil"></i> + <span>Edit</span> + </a> + </div> + <div class="list-group"> + <div class="list-group-item" + ng-repeat="contact in contactDetails"> + <label>{{contact.type}} - {{contact.name}}</label> + <h4 class="list-group-item-heading">{{contact.value}}</h4> + </div> + </div> + <div class="panel-footer"> + <small class="pull-left"> </small> + </div> + </div> + </div> + +  + <div id="notesListCard"> + <%@include file="cards/notesListCard.jsp" %> + </div> + +  + <%@include file="cards/employeesListCard.jsp" %> + </div> + + </div> + +</div> + + + +<script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.1/js/bootstrap.min.js"></script> +<script src="//cdnjs.cloudflare.com/ajax/libs/jqueryui/1.10.4/jquery-ui.min.js"></script> + + +<script src="https://cdnjs.cloudflare.com/ajax/libs/bootcards/1.1.0/js/bootcards.js"></script> + + +<div class="modal fade" id="editModal" tabindex="-1" role="dialog" aria-labelledby="editModal" aria-hidden="true"> + <div class="modal-dialog"> + <div class="modal-content"></div> + </div> +</div> + +<div class="modal fade" id="docsModal" tabindex="-1" role="dialog" aria-labelledby="docsModal" aria-hidden="true"> + <div class="modal-dialog"> + <div class="modal-content"></div> + </div> +</div> + +<script type="text/javascript"> + /* + * Initialize Bootcards. + * + * Parameters: + * - offCanvasBackdrop (boolean): show a backdrop when the offcanvas is shown + * - offCanvasHideOnMainClick (boolean): hide the offcanvas menu on clicking outside the off canvas + * - enableTabletPortraitMode (boolean): enable single pane mode for tablets in portraitmode + * - disableRubberBanding (boolean): disable the iOS rubber banding effect + * - disableBreakoutSelector (boolean) : for iOS apps that are added to the home screen: + jQuery selector to target links for which a fix should be added to not + allow those links to break out of fullscreen mode. + */ + + bootcards.init( { + offCanvasBackdrop : true, + offCanvasHideOnMainClick : true, + enableTabletPortraitMode : true, + disableRubberBanding : true + }); + </script> + +</body> diff --git a/chorem-webmotion/src/main/webapp/js/crm.js b/chorem-webmotion/src/main/webapp/js/crm.js new file mode 100644 index 0000000..95cb0ae --- /dev/null +++ b/chorem-webmotion/src/main/webapp/js/crm.js @@ -0,0 +1,72 @@ +var crmTest = angular.module('crmTest', []); + +crmTest.factory('sharedService', function($rootScope){ + var sharedService = {}; + + sharedService.company = ''; + + sharedService.broadcastCompanySelected = function (company) { + this.company = company; + $rootScope.$broadcast('companySelected'); + } + + return sharedService; + +}); + +crmTest.controller('CompanyListController', function ($scope, $http, sharedService) { + + $http.get('companies').success(function(data){ + $scope.companies = data; + $scope.companySelected=$scope.companies[0]; + sharedService.broadcastCompanySelected($scope.companySelected); + $scope.updateList(); + }); + + $scope.companies = ''; + + $scope.filteredCompanies = $scope.companies; + + $scope.search=""; + + $scope.companySelected=$scope.companies[0]; + + $scope.setCompanySelected=function(selectedCompany){ + $scope.companySelected = selectedCompany; + sharedService.broadcastCompanySelected(selectedCompany); + }; + + $scope.isCompanySelected=function(selectedCompany){ + return selectedCompany===$scope.companySelected; + }; + + $scope.updateList=function(){ + $scope.filteredCompanies=[]; + for (var index in $scope.companies) { + var company = $scope.companies[index]; + if (company.name.indexOf($scope.search)>-1){ + $scope.filteredCompanies.push(company); + } + } + } + +}); + +crmTest.controller('CompanyDetailsController', function ($scope, $http, sharedService){ + $scope.company = ''; + + $scope.contactDetails = ''; + + $scope.$on('companySelected', function(){ + $scope.company=sharedService.company; + $scope.updateContactDetails(); + }); + + $scope.updateContactDetails=function(){ + $http.get('companies/'+$scope.company.wikittyId+"/contactDetails").success(function(data){ + $scope.contactDetails = data; + }); + + }; + +}); \ No newline at end of file -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

branch feature/882 created (now 5349107)
by chorem.org scm 27 Feb '15

27 Feb '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/882 in repository chorem. See http://git.chorem.org/chorem.git at 5349107 refs #882 : complete note CRUD in companies slot This branch includes the following new commits: new 3446bf7 refs #882 : CRM Poc using Bootcards. To be continued. (Roughly showing companies list + each company info) new 03e6fd5 Merge branch 'develop' into feature/882 new 8af2c93 refs #882 : fix cards rendering new 1942c95 refs #882 : Can now edit companies new 160d0d8 refs #882 : On peut créer une société et voir des employés new 3821244 refs #882: On peut maintenant éditer des coordonnées et supprimer des sociétés new b40dc73 refs #882 : Clean Bootcards and PJax calls js, removing all reference to mobile browsing, target is desktop new 0fa7ab3 ref #882 : full ContactDetails CRUD on companies new 5349107 refs #882 : complete note CRUD in companies slot The 9 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 53491077788febb3be71bdd7edce0828ea27ec2d Author: kootox <jean.couteau(a)gmail.com> Date: Wed Feb 4 18:20:06 2015 +0100 refs #882 : complete note CRUD in companies slot commit 0fa7ab303d3b51ecab2e15bf24905aafeb4107a0 Author: kootox <jean.couteau(a)gmail.com> Date: Wed Feb 4 15:52:29 2015 +0100 ref #882 : full ContactDetails CRUD on companies commit b40dc7324f66811de07fc2c64db4a07b211e105e Author: kootox <jean.couteau(a)gmail.com> Date: Wed Feb 4 14:30:19 2015 +0100 refs #882 : Clean Bootcards and PJax calls js, removing all reference to mobile browsing, target is desktop commit 3821244fb976ed6e9ada7f823c2a138536f4e103 Author: kootox <jean.couteau(a)gmail.com> Date: Wed Feb 4 09:56:29 2015 +0100 refs #882: On peut maintenant éditer des coordonnées et supprimer des sociétés commit 160d0d8a1f851f1ee2710fa4ed433f12eaa13ca1 Author: kootox <jean.couteau(a)gmail.com> Date: Tue Feb 3 14:29:34 2015 +0100 refs #882 : On peut créer une société et voir des employés commit 1942c9560a4fec497777fe4bd8f215945b3b8398 Author: kootox <jean.couteau(a)gmail.com> Date: Tue Feb 3 10:45:20 2015 +0100 refs #882 : Can now edit companies commit 8af2c93288be9d78cf5be582dfd77cb43cbd72ee Author: kootox <jean.couteau(a)gmail.com> Date: Fri Jan 30 15:52:57 2015 +0100 refs #882 : fix cards rendering commit 03e6fd588a8a419c7d432fc71887e385c74246de Merge: 3446bf7 ad12bdc Author: kootox <jean.couteau(a)gmail.com> Date: Fri Jan 30 15:17:15 2015 +0100 Merge branch 'develop' into feature/882 commit 3446bf77ef341663cf16ab44f6d5f1a694db5bcd Author: kootox <jean.couteau(a)gmail.com> Date: Fri Jan 30 15:09:36 2015 +0100 refs #882 : CRM Poc using Bootcards. To be continued. (Roughly showing companies list + each company info) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 9

branch develop updated (a728d75 -> 3fa1595)
by chorem.org scm 30 Jan '15

30 Jan '15

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository chorem. See http://git.chorem.org/chorem.git from a728d75 some upgrade new 3fa1595 is expense account page cuter ? The 1 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 3fa15951d3866cecfb20100800ff340309a4155c Author: Yannick Martel <yannick.martel(a)gmail.com> Date: Fri Jan 30 17:44:44 2015 +0100 is expense account page cuter ? Summary of changes: .../src/main/webapp/WEB-INF/jsp/decorator.jsp | 6 ++- .../jsp/financial/expenseAccountEntryEdit.html | 1 + .../WEB-INF/jsp/financial/expenseAccountView.jsp | 62 +++++++++++----------- 3 files changed, 37 insertions(+), 32 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch develop updated (ad12bdc -> a728d75)
by chorem.org scm 30 Jan '15

30 Jan '15

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository chorem. See http://git.chorem.org/chorem.git from ad12bdc refs #1155 : Commit forgotten file new a728d75 some upgrade The 1 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 a728d751c9e3055cc1464619ce8b196d085bc17b Author: Yannick Martel <yannick.martel(a)gmail.com> Date: Fri Jan 30 16:31:45 2015 +0100 some upgrade Summary of changes: pom.xml | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1