Author: bbrossaud Date: 2010-07-16 17:34:30 +0200 (Fri, 16 Jul 2010) New Revision: 106 Url: http://chorem.org/repositories/revision/bonzoms/106 Log: addition employee form Added: trunk/bonzoms-ui-zk/src/license/ trunk/bonzoms-ui-zk/src/license/project.xml trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ContractFormController.java trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ContractsData.java trunk/bonzoms-ui-zk/src/main/webapp/contractFormPage.zul Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/AddressesModel.java trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/BonzomsConfig.java trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/BonzomsProxy.java trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/CompanyController.java trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/CompanyData.java trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/CompanyFormController.java trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/CompanyModel.java trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ContractsModel.java trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/Email.java trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/EmailsModel.java trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/EmployeeController.java trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/EmployeeData.java trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/EmployeeFormController.java trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/EmployeeModel.java trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/FieldExtension.java trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/MainController.java trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/Model.java trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/PersonController.java trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/PersonData.java trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/Phone.java trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/PhonesModel.java trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ResultController.java trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ServiceData.java trunk/bonzoms-ui-zk/src/main/webapp/companyFormPage.zul trunk/bonzoms-ui-zk/src/main/webapp/companyPage.zul trunk/bonzoms-ui-zk/src/main/webapp/employeeFormPage.zul trunk/bonzoms-ui-zk/transaction.log Added: trunk/bonzoms-ui-zk/src/license/project.xml =================================================================== --- trunk/bonzoms-ui-zk/src/license/project.xml (rev 0) +++ trunk/bonzoms-ui-zk/src/license/project.xml 2010-07-16 15:34:30 UTC (rev 106) @@ -0,0 +1,20 @@ +<?xml version='1.0' encoding='UTF-8'?> +<project xmlns="http://maven-site.nuiton.org/maven-license-plugin/1.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven-site.nuiton.org/maven-license-plugin/1.0.0 ">http://maven-site.nuiton.org/maven-license-plugin/licenseProjectDescriptor-1.0.0.xsd"> + <mainLicense>agpl_v3</mainLicense> + <headers> + <header> + <licenseName>agpl_v3</licenseName> + <commentStyle>java</commentStyle> + <fileSets> + <fileSet> + <basedir>src/main/java</basedir> + <includes> + <include>**/*.java</include> + </includes> + </fileSet> + </fileSets> + </header> + </headers> +</project> Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/AddressesModel.java =================================================================== --- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/AddressesModel.java 2010-07-15 12:16:36 UTC (rev 105) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/AddressesModel.java 2010-07-16 15:34:30 UTC (rev 106) @@ -1,8 +1,26 @@ /* - * To change this template, choose Tools | Templates - * and open the template in the editor. + * #%L + * Bonzoms : bonzoms-zk + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ - package org.chorem.bonzoms.ui; import java.util.ArrayList; Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/BonzomsConfig.java =================================================================== --- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/BonzomsConfig.java 2010-07-15 12:16:36 UTC (rev 105) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/BonzomsConfig.java 2010-07-16 15:34:30 UTC (rev 106) @@ -1,4 +1,27 @@ /* + * #%L + * Bonzoms : bonzoms-zk + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +/* * To change this template, choose Tools | Templates * and open the template in the editor. */ Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/BonzomsProxy.java =================================================================== --- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/BonzomsProxy.java 2010-07-15 12:16:36 UTC (rev 105) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/BonzomsProxy.java 2010-07-16 15:34:30 UTC (rev 106) @@ -1,4 +1,27 @@ /* + * #%L + * Bonzoms : bonzoms-zk + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +/* * To change this template, choose Tools | Templates * and open the template in the editor. */ Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/CompanyController.java =================================================================== --- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/CompanyController.java 2010-07-15 12:16:36 UTC (rev 105) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/CompanyController.java 2010-07-16 15:34:30 UTC (rev 106) @@ -1,8 +1,26 @@ /* - * To change this template, choose Tools | Templates - * and open the template in the editor. + * #%L + * Bonzoms : bonzoms-zk + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ - package org.chorem.bonzoms.ui; import java.util.ArrayList; @@ -31,29 +49,29 @@ public class CompanyController extends GenericForwardComposer { protected Model _model = new Model(); - protected CompanyModel _companyDTOModel = new CompanyModel(); + protected CompanyModel _companyDataModel = new CompanyModel(); public CompanyController() { List<Company> companies = _model.retrieveAllCompanies(); - List<CompanyData> dto = createCompaniesDTO(companies); - _companyDTOModel.setCompanies(dto); + List<CompanyData> dto = createCompaniesData(companies); + _companyDataModel.setCompanies(dto); } - public List<CompanyData> createCompaniesDTO(List<Company> companies) { - List<CompanyData> dtos = new ArrayList<CompanyData>(); + public List<CompanyData> createCompaniesData(List<Company> companies) { + List<CompanyData> datas = new ArrayList<CompanyData>(); for (Company company: companies) { List<Address> addresses = _model.retrieveAddressesByIds(new ArrayList<String>(company.getAddress())); - CompanyData dto = new CompanyData(company, addresses); - dtos.add(dto); + CompanyData data = new CompanyData(company, addresses); + datas.add(data); } - return dtos; + return datas; } - public void createWindowCompanyForm(CompanyData company) throws SuspendNotAllowedException, InterruptedException { + public void createWindowCompanyForm(CompanyData companyData) throws SuspendNotAllowedException, InterruptedException { Map<String, Object> map = new HashMap<String, Object>(); - if (company != null) { - map.put("company", company); + if (companyData != null) { + map.put("companyData", companyData); } Window win = (Window) Executions.createComponents("companyFormPage.zul", null, map); win.setPage(page); @@ -122,20 +140,20 @@ return listcell; } - public ListitemRenderer getCompanyRenderer() { + public ListitemRenderer getCompanyDataRenderer() { return new ListitemRenderer() { @Override public void render(Listitem item, Object data) throws Exception { item.setValue(data); - final CompanyData companyDTO = (CompanyData) data; + final CompanyData companyData = (CompanyData) data; - Listcell nameCell = new Listcell(companyDTO.getCompany().getName()); - Listcell webSiteCell = new Listcell(companyDTO.getCompany().getWebSite()); - Listcell phoneFaxCell = phonesFaxRenderer(companyDTO); - Listcell emailCell = emailsRenderer(companyDTO); - Listcell addressCell = addressesRenderer(companyDTO); - Listcell typeCell = new Listcell(companyDTO.getCompany().getType()); + Listcell nameCell = new Listcell(companyData.getCompany().getName()); + Listcell webSiteCell = new Listcell(companyData.getCompany().getWebSite()); + Listcell phoneFaxCell = phonesFaxRenderer(companyData); + Listcell emailCell = emailsRenderer(companyData); + Listcell addressCell = addressesRenderer(companyData); + Listcell typeCell = new Listcell(companyData.getCompany().getType()); Listcell detailsCell = new Listcell(); Button details = new Button("details"); detailsCell.appendChild(details); @@ -143,7 +161,7 @@ @Override public void onEvent(Event event) throws Exception { - createWindowCompanyForm(companyDTO); + createWindowCompanyForm(companyData); } }); @@ -165,7 +183,7 @@ /* * Getters */ - public CompanyModel getCompanyDTOModel() { - return _companyDTOModel; + public CompanyModel getCompanyModel() { + return _companyDataModel; } } Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/CompanyData.java =================================================================== --- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/CompanyData.java 2010-07-15 12:16:36 UTC (rev 105) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/CompanyData.java 2010-07-16 15:34:30 UTC (rev 106) @@ -1,6 +1,25 @@ /* - * To change this template, choose Tools | Templates - * and open the template in the editor. + * #%L + * Bonzoms : bonzoms-zk + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package org.chorem.bonzoms.ui; @@ -18,6 +37,9 @@ protected Company company = new CompanyImpl(); + protected PhonesModel phonesModel = new PhonesModel(); + protected EmailsModel emailsModel = new EmailsModel(); + protected AddressesModel addressesModel = new AddressesModel(); protected List<String> removedAddresses = new ArrayList<String>(); @@ -47,6 +69,22 @@ return addressesModel; } + public EmailsModel getEmailsModel() { + return emailsModel; + } + + public List<Email> getEmails() { + return emailsModel.getEmails(); + } + + public PhonesModel getPhonesModel() { + return phonesModel; + } + + public List<Phone> getPhones() { + return phonesModel.getPhones(); + } + /* * Setters */ @@ -71,4 +109,20 @@ public void setAddressesModel(AddressesModel addr) { addressesModel = addr; } + + public void setEmailsModel(EmailsModel emailsModel) { + this.emailsModel = emailsModel; + } + + public void setPhonesModel(PhonesModel phonesModel) { + this.phonesModel = phonesModel; + } + + public void setPhones(List<Phone> phones) { + phonesModel.setPhones(phones); + } + + public void setEmails(List<Email> emails) { + emailsModel.setEmails(emails); + } } Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/CompanyFormController.java =================================================================== --- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/CompanyFormController.java 2010-07-15 12:16:36 UTC (rev 105) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/CompanyFormController.java 2010-07-16 15:34:30 UTC (rev 106) @@ -1,8 +1,26 @@ /* - * To change this template, choose Tools | Templates - * and open the template in the editor. + * #%L + * Bonzoms : bonzoms-zk + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ - package org.chorem.bonzoms.ui; import java.util.ArrayList; @@ -29,9 +47,6 @@ protected CompanyData _companyData = new CompanyData(); - protected PhonesModel phonesModel = new PhonesModel(); - protected EmailsModel emailsModel = new EmailsModel(); - protected Listbox addressListbox; protected Listbox phoneListbox; protected Listbox emailListbox; @@ -59,10 +74,10 @@ _companyData.getAddressesModel().addData(address); Phone phone = new Phone(); - phonesModel.addData(phone); + _companyData.getPhonesModel().addData(phone); Email email = new Email(); - emailsModel.addData(email); + _companyData.getEmailsModel().addData(email); Button add = new Button("Add"); add.addEventListener("onClick", new EventListener() { @@ -99,7 +114,7 @@ Phone newPhone = new Phone(values[0], values[1]); phoneList.add(newPhone); } - phonesModel.setPhones(phoneList); + _companyData.setPhones(phoneList); } public void initEmailsModel() { @@ -111,7 +126,7 @@ Email newEmail = new Email(values[0], values[1]); emailList.add(newEmail); } - emailsModel.setEmails(emailList); + _companyData.setEmails(emailList); } protected void addAddresses(boolean update) { @@ -127,7 +142,7 @@ protected void addEmails() { String emails = ""; - List<Email> emailList = emailsModel.getEmails(); + List<Email> emailList = _companyData.getEmails(); for (Email email : emailList) { emails += email.getName() + ":" + email.getEmail() + ";"; } @@ -136,7 +151,7 @@ protected void addPhones() { String phones = ""; - List<Phone> phoneList = phonesModel.getPhones(); + List<Phone> phoneList = _companyData.getPhones(); for (Phone phone : phoneList) { phones += phone.getName() + ":" + phone.getPhone() + ";"; } @@ -183,46 +198,34 @@ public void onClick$addPhone() { Phone phone = new Phone(); - phonesModel.addData(phone); + _companyData.getPhonesModel().addData(phone); } public void onClick$deletePhone() { int size = phoneListbox.getItemCount(); if (size > 1) { - Phone phone = (Phone) phonesModel.getElementAt(size -1); - phonesModel.removeData(phone); + Phone phone = (Phone) _companyData.getPhonesModel().getElementAt(size -1); + _companyData.getPhonesModel().removeData(phone); } } public void onClick$addEmail() { Email email = new Email(); - emailsModel.addData(email); + _companyData.getEmailsModel().addData(email); } public void onClick$deleteEmail() { int size = emailListbox.getItemCount(); if (size > 1) { - Email email = (Email) emailsModel.getElementAt(size -1); - emailsModel.removeData(email); + Email email = (Email) _companyData.getEmailsModel().getElementAt(size -1); + _companyData.getEmailsModel().removeData(email); } } /* * Getters */ - public AddressesModel getAddressesModel() { - return _companyData.getAddressesModel(); + public CompanyData getCompanyData() { + return _companyData; } - - public Company getCompany() { - return _companyData.getCompany(); - } - - public PhonesModel getPhonesModel() { - return phonesModel; - } - - public EmailsModel getEmailsModel() { - return emailsModel; - } } Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/CompanyModel.java =================================================================== --- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/CompanyModel.java 2010-07-15 12:16:36 UTC (rev 105) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/CompanyModel.java 2010-07-16 15:34:30 UTC (rev 106) @@ -1,8 +1,26 @@ /* - * To change this template, choose Tools | Templates - * and open the template in the editor. + * #%L + * Bonzoms : bonzoms-zk + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ - package org.chorem.bonzoms.ui; import java.util.ArrayList; Added: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ContractFormController.java =================================================================== --- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ContractFormController.java (rev 0) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ContractFormController.java 2010-07-16 15:34:30 UTC (rev 106) @@ -0,0 +1,67 @@ +package org.chorem.bonzoms.ui; + +import java.util.ArrayList; +import java.util.List; +import org.chorem.data.bonzoms.EmploymentContract; +import org.chorem.data.bonzoms.EmploymentContractImpl; +import org.zkoss.zk.ui.Component; +import org.zkoss.zk.ui.util.GenericForwardComposer; +import org.zkoss.zkplus.databind.AnnotateDataBinder; +import org.zkoss.zkplus.databind.DataBinder; +import org.zkoss.zul.Listbox; + +/** + * + * @author sherkhan + */ +public class ContractFormController extends GenericForwardComposer { + + protected ContractsData contractsData = new ContractsData(); + protected List<EmploymentContract> save = new ArrayList<EmploymentContract>(); + protected Listbox contractListbox; + + @Override + public void doAfterCompose(Component comp) throws Exception { + super.doAfterCompose(comp); + contractsData = (ContractsData) arg.get("contractsData"); + save = new ArrayList<EmploymentContract>(contractsData.getContractsList()); + DataBinder binder = new AnnotateDataBinder(comp); + binder.bindBean("composer", this); + binder.loadAll(); + } + + /* + * Events + */ + public void onClick$addContract() { + EmploymentContract contract = new EmploymentContractImpl(); + contractsData.getContractsModel().addData(contract); + } + + public void onClick$deleteContract() { + int size = contractListbox.getItemCount(); + if (size > 1) { + EmploymentContract contract = (EmploymentContract) contractsData.getContractsModel().getElementAt(size -1); + contractsData.getContractsModel().removeData(contract); + String id = contract.getWikittyId(); + if (!id.isEmpty()) { + contractsData.getRemovedContracts().add(id); + } + } + } + + /* + * Getters + */ + public ContractsModel getContractsModel() { + return contractsData.getContractsModel(); + } + + public void onClose() { + contractsData.setContractsList(save); + } + + public void onClick$save() { + self.detach(); + } +} Added: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ContractsData.java =================================================================== --- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ContractsData.java (rev 0) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ContractsData.java 2010-07-16 15:34:30 UTC (rev 106) @@ -0,0 +1,39 @@ +package org.chorem.bonzoms.ui; + +import java.util.ArrayList; +import java.util.List; +import org.chorem.data.bonzoms.EmploymentContract; + +/** + * + * @author sherkhan + */ +public class ContractsData { + + protected ContractsModel contractsModel = new ContractsModel(); + protected List<String> removedContracts = new ArrayList<String>(); + + /* + * Setters + */ + + public void setContractsList(List<EmploymentContract> contracts) { + contractsModel.setContracts(contracts); + } + + /* + * Getters + */ + + public ContractsModel getContractsModel() { + return contractsModel; + } + + public List<EmploymentContract> getContractsList() { + return contractsModel.getContracts(); + } + + public List<String> getRemovedContracts() { + return removedContracts; + } +} Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ContractsModel.java =================================================================== --- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ContractsModel.java 2010-07-15 12:16:36 UTC (rev 105) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ContractsModel.java 2010-07-16 15:34:30 UTC (rev 106) @@ -1,6 +1,25 @@ /* - * To change this template, choose Tools | Templates - * and open the template in the editor. + * #%L + * Bonzoms : bonzoms-zk + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package org.chorem.bonzoms.ui; Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/Email.java =================================================================== --- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/Email.java 2010-07-15 12:16:36 UTC (rev 105) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/Email.java 2010-07-16 15:34:30 UTC (rev 106) @@ -1,13 +1,28 @@ /* - * To change this template, choose Tools | Templates - * and open the template in the editor. + * #%L + * Bonzoms : bonzoms-zk + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package org.chorem.bonzoms.ui; -/** - * - * @author sherkhan - */ public class Email { protected String email = ""; Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/EmailsModel.java =================================================================== --- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/EmailsModel.java 2010-07-15 12:16:36 UTC (rev 105) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/EmailsModel.java 2010-07-16 15:34:30 UTC (rev 106) @@ -1,8 +1,26 @@ /* - * To change this template, choose Tools | Templates - * and open the template in the editor. + * #%L + * Bonzoms : bonzoms-zk + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ - package org.chorem.bonzoms.ui; import java.util.ArrayList; Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/EmployeeController.java =================================================================== --- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/EmployeeController.java 2010-07-15 12:16:36 UTC (rev 105) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/EmployeeController.java 2010-07-16 15:34:30 UTC (rev 106) @@ -1,6 +1,25 @@ /* - * To change this template, choose Tools | Templates - * and open the template in the editor. + * #%L + * Bonzoms : bonzoms-zk + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package org.chorem.bonzoms.ui; Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/EmployeeData.java =================================================================== --- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/EmployeeData.java 2010-07-15 12:16:36 UTC (rev 105) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/EmployeeData.java 2010-07-16 15:34:30 UTC (rev 106) @@ -1,10 +1,28 @@ /* - * To change this template, choose Tools | Templates - * and open the template in the editor. + * #%L + * Bonzoms : bonzoms-zk + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package org.chorem.bonzoms.ui; -import java.net.Socket; import java.util.ArrayList; import java.util.List; import org.chorem.data.bonzoms.Address; @@ -22,20 +40,18 @@ public class EmployeeData { protected Employee employee = new EmployeeImpl(); - protected Address address = new AddressImpl(); + protected Address workingAddress = new AddressImpl(); protected PersonData personData = new PersonData(); protected ServiceData serviceData = new ServiceData(); - protected ContractsModel contractsModel = new ContractsModel(); - protected List<String> removedContracts = new ArrayList<String>(); - + protected ContractsData contractsData = new ContractsData(); public EmployeeData() { } public EmployeeData(Employee employee, Address address) { this.employee = employee; - this.address = address; + this.workingAddress = address; } /* @@ -49,12 +65,12 @@ this.personData = personData; } - public void setAddress(Address address) { - this.address = address; + public void setWorkingAddress(Address address) { + this.workingAddress = address; } - public void setContractsModelList(List<EmploymentContract> contracts) { - contractsModel.setContracts(contracts); + public void setContractsList(List<EmploymentContract> contracts) { + contractsData.getContractsModel().setContracts(contracts); } public void setPersonPhones(List<Phone> phones) { @@ -81,6 +97,15 @@ serviceData.setAddress(address); } + public void setContractsData(ContractsData contractsData) { + this.contractsData = contractsData; + } + + public void setServiceData(ServiceData serviceData) { + this.serviceData = serviceData; + } + + /* * Getters */ @@ -92,20 +117,20 @@ return personData; } - public Address getAddress() { - return address; + public Address getWorkingAddress() { + return workingAddress; } public ContractsModel getContractsModel() { - return contractsModel; + return contractsData.getContractsModel(); } - public List<EmploymentContract> getContractsModelList() { - return contractsModel.getContracts(); + public List<EmploymentContract> getContractsList() { + return contractsData.getContractsList(); } public List<String> getRemovedContracts() { - return removedContracts; + return contractsData.getRemovedContracts(); } public Person getPerson() { @@ -151,4 +176,8 @@ public Address getServiceAddress() { return serviceData.getAddress(); } + + public ContractsData getContractsData() { + return contractsData; + } } Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/EmployeeFormController.java =================================================================== --- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/EmployeeFormController.java 2010-07-15 12:16:36 UTC (rev 105) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/EmployeeFormController.java 2010-07-16 15:34:30 UTC (rev 106) @@ -1,22 +1,46 @@ /* - * To change this template, choose Tools | Templates - * and open the template in the editor. + * #%L + * Bonzoms : bonzoms-zk + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package org.chorem.bonzoms.ui; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; import org.chorem.data.bonzoms.Address; import org.chorem.data.bonzoms.AddressImpl; +import org.chorem.data.bonzoms.EmploymentContract; +import org.chorem.data.bonzoms.EmploymentContractImpl; +import org.chorem.data.bonzoms.Service; import org.nuiton.util.StringUtil; import org.zkoss.zk.ui.Component; -import org.zkoss.zk.ui.event.Event; -import org.zkoss.zk.ui.event.EventListener; +import org.zkoss.zk.ui.Executions; +import org.zkoss.zk.ui.SuspendNotAllowedException; import org.zkoss.zk.ui.util.GenericForwardComposer; import org.zkoss.zkplus.databind.AnnotateDataBinder; import org.zkoss.zkplus.databind.DataBinder; -import org.zkoss.zul.Button; import org.zkoss.zul.Listbox; +import org.zkoss.zul.Window; /** * @@ -60,16 +84,8 @@ Email email = new Email(); _employeeData.getPersonEmailsModel().addData(email); - Button add = new Button("Add"); - add.setId("addEmployee"); - add.addEventListener("onClick", new EventListener() { - - @Override - public void onEvent(Event event) throws Exception { - onClick$addEmployee(); - } - }); - self.appendChild(add); + EmploymentContract contract = new EmploymentContractImpl(); + _employeeData.getContractsModel().addData(contract); } protected void initPerson() { @@ -104,30 +120,44 @@ } protected void initService() { - + Service service = _model.retrieveServiceById(_employeeData.getEmployee().getService()); + Address address = _model.retrieveAddressById(service.getAddress()); + _employeeData.setService(service); + _employeeData.setServiceAddress(address); } + protected void initContracts() { + List<String> ids = new ArrayList<String>(_employeeData.getEmployee().getEmploymentContract()); + List<EmploymentContract> contracts = _model.retrieveContractsByIds(ids); + _employeeData.setContractsList(contracts); + } + protected void initEmployee(EmployeeData employee) { _employeeData = employee; - Address workingAddress = _model.retrieveAddressById(employee.getEmployee().getAddress()); - _employeeData.setAddress(workingAddress); + _employeeData.setWorkingAddress(workingAddress); - Button update = new Button("Update"); - update.setId("updateEmployee"); - update.addEventListener("onClick", new EventListener() { + initPerson(); - @Override - public void onEvent(Event event) throws Exception { - onClick$updateEmployee(); - } - }); - self.appendChild(update); + initService(); + + initContracts(); } - protected void addPersonAddresses(boolean update) { + protected void addEmployeeContracts() { + List<EmploymentContract> contracts = _model.createContracts(_employeeData.getContractsList()); + if (!_employeeData.getRemovedContracts().isEmpty()) { + _model.deleteContractsByIds(_employeeData.getRemovedContracts()); + } + _employeeData.getContractsList().clear(); + for (EmploymentContract contract : contracts) { + _employeeData.getEmployee().addEmploymentContract(contract.getWikittyId()); + } + } + + protected void addPersonAddresses() { List<Address> addresses = _model.createAddresses(_employeeData.getPersonAddresses()); - if (update == true) { + if (!_employeeData.getPersonRemovedAddresses().isEmpty()) { _model.deleteAddressesByIds(_employeeData.getPersonRemovedAddresses()); } _employeeData.getPerson().clearAddress(); @@ -136,7 +166,7 @@ } } - protected void addPersonEmails(boolean update) { + protected void addPersonEmails() { String emails = ""; List<Email> emailList = _employeeData.getPersonEmails(); for (Email email : emailList) { @@ -145,7 +175,7 @@ _employeeData.getPerson().setEmails(emails); } - protected void addPersonPhones(boolean update) { + protected void addPersonPhones() { String phones = ""; List<Phone> phoneList = _employeeData.getPersonPhones(); for (Phone phone : phoneList) { @@ -200,27 +230,39 @@ } } - public void onClick$updateEmployee() { - addPersonAddresses(true); - addPersonPhones(true); - addPersonEmails(true); + public void onClick$saveEmployee() { + addPersonAddresses(); + addPersonPhones(); + addPersonEmails(); - _model.updateAddress(_employeeData.getAddress()); + addEmployeeContracts(); + Address workingAddress = _model.updateAddress(_employeeData.getWorkingAddress()); + _employeeData.getEmployee().setAddress(workingAddress.getWikittyId()); + + Service service = _model.updateService(_employeeData.getService()); + _employeeData.getEmployee().setService(service.getWikittyId()); + _model.updateEmployee(_employeeData.getEmployee()); this.self.detach(); } - public void onClick$addEmployee() { - addPersonAddresses(false); - addPersonPhones(false); - addPersonEmails(false); + public void onClick$editContracts() throws SuspendNotAllowedException, InterruptedException { + Map<String, Object> map = new HashMap<String, Object>(); + map.put("contractsData", _employeeData.getContractsData()); + Window win = (Window) Executions.createComponents("contractFormPage.zul", null, map); + win.setPage(page); + win.setPosition("right,center"); + win.doModal(); + } - Address workingAddress = _model.createAddress(_employeeData.getAddress()); - _employeeData.getEmployee().setAddress(workingAddress.getWikittyId()); - - _model.createEmployee(_employeeData.getEmployee()); - this.self.detach(); + public void onClick$editService() throws SuspendNotAllowedException, InterruptedException { + Map<String, Object> map = new HashMap<String, Object>(); + map.put("serviceData", _employeeData.getServiceData()); + Window win = (Window) Executions.createComponents("serviceFormPage.zul", null, map); + win.setPage(page); + win.setPosition("left,center"); + win.doModal(); } /* Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/EmployeeModel.java =================================================================== --- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/EmployeeModel.java 2010-07-15 12:16:36 UTC (rev 105) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/EmployeeModel.java 2010-07-16 15:34:30 UTC (rev 106) @@ -1,8 +1,26 @@ /* - * To change this template, choose Tools | Templates - * and open the template in the editor. + * #%L + * Bonzoms : bonzoms-zk + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ - package org.chorem.bonzoms.ui; import java.util.ArrayList; Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/FieldExtension.java =================================================================== --- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/FieldExtension.java 2010-07-15 12:16:36 UTC (rev 105) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/FieldExtension.java 2010-07-16 15:34:30 UTC (rev 106) @@ -1,4 +1,27 @@ /* + * #%L + * Bonzoms : bonzoms-zk + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +/* * To change this template, choose Tools | Templates * and open the template in the editor. */ Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/MainController.java =================================================================== --- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/MainController.java 2010-07-15 12:16:36 UTC (rev 105) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/MainController.java 2010-07-16 15:34:30 UTC (rev 106) @@ -1,6 +1,25 @@ /* - * To change this template, choose Tools | Templates - * and open the template in the editor. + * #%L + * Bonzoms : bonzoms-zk + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package org.chorem.bonzoms.ui; Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/Model.java =================================================================== --- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/Model.java 2010-07-15 12:16:36 UTC (rev 105) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/Model.java 2010-07-16 15:34:30 UTC (rev 106) @@ -1,6 +1,25 @@ /* - * To change this template, choose Tools | Templates - * and open the template in the editor. + * #%L + * Bonzoms : bonzoms-zk + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package org.chorem.bonzoms.ui; @@ -9,11 +28,11 @@ import org.chorem.data.bonzoms.Address; import org.chorem.data.bonzoms.Company; import org.chorem.data.bonzoms.Employee; +import org.chorem.data.bonzoms.EmploymentContract; import org.chorem.data.bonzoms.Person; +import org.chorem.data.bonzoms.Service; import org.nuiton.wikitty.Criteria; -import org.nuiton.wikitty.WikittyExtension; import org.nuiton.wikitty.WikittyProxy; -import org.nuiton.wikitty.WikittyService; import org.nuiton.wikitty.search.Element; import org.nuiton.wikitty.search.Search; @@ -49,6 +68,11 @@ proxy.store(company); } + public List<EmploymentContract> createContracts(List<EmploymentContract> contractsList) { + List<EmploymentContract> wikitties = proxy.store(contractsList); + return wikitties; + } + /* * Retrieve */ @@ -79,38 +103,55 @@ return new ArrayList<Address>(addresses); } + public Service retrieveServiceById(String id) { + return proxy.restore(Service.class, id); + } + + public List<EmploymentContract> retrieveContractsByIds(List<String> ids) { + List<EmploymentContract> contracts = proxy.restore(EmploymentContract.class, ids); + return new ArrayList<EmploymentContract>(contracts); + } + /* * Update */ - public List<Address> updatePersonAddresses(List<Address> addresses) { - List<Address> wikitties = proxy.store(addresses); - return wikitties; - } + public List<Address> updatePersonAddresses(List<Address> addresses) { + List<Address> wikitties = proxy.store(addresses); + return wikitties; + } - public Address updateAddress(Address address) { - return proxy.store(address); - } + public Address updateAddress(Address address) { + return proxy.store(address); + } - public Employee updateEmployee(Employee employee) { - return proxy.store(employee); - } + public Employee updateEmployee(Employee employee) { + return proxy.store(employee); + } - public Company updateCompany(Company company) { - return proxy.store(company); - } + public Company updateCompany(Company company) { + return proxy.store(company); + } + public Service updateService(Service service) { + return proxy.store(service); + } + /* * Delete */ - public void deleteAddressesByIds(List<String> ids) { - proxy.delete(ids); - } + public void deleteAddressesByIds(List<String> ids) { + proxy.delete(ids); + } - public void deletePhonesByIds(List<String> ids) { - proxy.delete(ids); - } + public void deletePhonesByIds(List<String> ids) { + proxy.delete(ids); + } - public void deleteEmailsByIds(List<String> ids) { - proxy.delete(ids); - } + public void deleteEmailsByIds(List<String> ids) { + proxy.delete(ids); + } + + public void deleteContractsByIds(List<String> removedContracts) { + proxy.delete(removedContracts); + } } Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/PersonController.java =================================================================== --- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/PersonController.java 2010-07-15 12:16:36 UTC (rev 105) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/PersonController.java 2010-07-16 15:34:30 UTC (rev 106) @@ -1,4 +1,27 @@ /* + * #%L + * Bonzoms : bonzoms-zk + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +/* * To change this template, choose Tools | Templates * and open the template in the editor. */ Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/PersonData.java =================================================================== --- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/PersonData.java 2010-07-15 12:16:36 UTC (rev 105) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/PersonData.java 2010-07-16 15:34:30 UTC (rev 106) @@ -1,6 +1,25 @@ /* - * To change this template, choose Tools | Templates - * and open the template in the editor. + * #%L + * Bonzoms : bonzoms-zk + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package org.chorem.bonzoms.ui; Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/Phone.java =================================================================== --- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/Phone.java 2010-07-15 12:16:36 UTC (rev 105) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/Phone.java 2010-07-16 15:34:30 UTC (rev 106) @@ -1,6 +1,25 @@ /* - * To change this template, choose Tools | Templates - * and open the template in the editor. + * #%L + * Bonzoms : bonzoms-zk + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package org.chorem.bonzoms.ui; Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/PhonesModel.java =================================================================== --- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/PhonesModel.java 2010-07-15 12:16:36 UTC (rev 105) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/PhonesModel.java 2010-07-16 15:34:30 UTC (rev 106) @@ -1,8 +1,26 @@ /* - * To change this template, choose Tools | Templates - * and open the template in the editor. + * #%L + * Bonzoms : bonzoms-zk + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ - package org.chorem.bonzoms.ui; import java.util.ArrayList; Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ResultController.java =================================================================== --- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ResultController.java 2010-07-15 12:16:36 UTC (rev 105) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ResultController.java 2010-07-16 15:34:30 UTC (rev 106) @@ -1,4 +1,27 @@ /* + * #%L + * Bonzoms : bonzoms-zk + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +/* * To change this template, choose Tools | Templates * and open the template in the editor. */ Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ServiceData.java =================================================================== --- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ServiceData.java 2010-07-15 12:16:36 UTC (rev 105) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ServiceData.java 2010-07-16 15:34:30 UTC (rev 106) @@ -1,8 +1,26 @@ /* - * To change this template, choose Tools | Templates - * and open the template in the editor. + * #%L + * Bonzoms : bonzoms-zk + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ - package org.chorem.bonzoms.ui; import org.chorem.data.bonzoms.Address; Modified: trunk/bonzoms-ui-zk/src/main/webapp/companyFormPage.zul =================================================================== --- trunk/bonzoms-ui-zk/src/main/webapp/companyFormPage.zul 2010-07-15 12:16:36 UTC (rev 105) +++ trunk/bonzoms-ui-zk/src/main/webapp/companyFormPage.zul 2010-07-16 15:34:30 UTC (rev 106) @@ -11,23 +11,23 @@ <vbox> <label value="Name" /> - <textbox value="@{composer.company.name, save-when='self.onChange'}" /> + <textbox value="@{composer.companyData.company.name, save-when='self.onChange'}" /> <label value="Type" /> - <textbox value="@{composer.company.type, save-when='self.onChange'}" /> + <textbox value="@{composer.companyData.company.type, save-when='self.onChange'}" /> <label value="Fax" /> - <textbox value="@{composer.company.fax, save-when='self.onChange'}" /> + <textbox value="@{composer.companyData.company.fax, save-when='self.onChange'}" /> <label value="Web site" /> - <textbox value="@{composer.company.webSite, save-when='self.onChange'}" /> + <textbox value="@{composer.companyData.company.webSite, save-when='self.onChange'}" /> </vbox> <space /> <vbox> - <listbox id="addressListbox" model="@{composer.addressesModel}" width="200px"> + <listbox id="addressListbox" model="@{composer.companyData.addressesModel}" width="200px"> <listitem self="@{each='address'}"> <listcell> <groupbox> @@ -69,7 +69,7 @@ <groupbox> <caption label="Phones" /> - <listbox id="phoneListbox" model="@{composer.phonesModel}" width="310px"> + <listbox id="phoneListbox" model="@{composer.companyData.phonesModel}" width="310px"> <listhead sizable="true"> <listheader label="Name" /> <listheader label="Phone Number" /> @@ -79,7 +79,7 @@ <textbox value="@{phone.name, save-when='self.onChange'}" /> </listcell> <listcell> - <textbox value="@{phone.number, save-when='self.onChange'}" /> + <textbox value="@{phone.phone, save-when='self.onChange'}" /> </listcell> </listitem> </listbox> @@ -96,7 +96,7 @@ <groupbox> <caption label="Emails" /> - <listbox id="emailListbox" model="@{composer.emailsModel}" width="310px"> + <listbox id="emailListbox" model="@{composer.companyData.emailsModel}" width="310px"> <listhead sizable="true"> <listheader label="Name" /> <listheader label="Email" /> @@ -106,7 +106,7 @@ <textbox value="@{mail.name, save-when='self.onChange'}" /> </listcell> <listcell> - <textbox value="@{mail.mail, save-when='self.onChange'}" /> + <textbox value="@{mail.email, save-when='self.onChange'}" /> </listcell> </listitem> </listbox> Modified: trunk/bonzoms-ui-zk/src/main/webapp/companyPage.zul =================================================================== --- trunk/bonzoms-ui-zk/src/main/webapp/companyPage.zul 2010-07-15 12:16:36 UTC (rev 105) +++ trunk/bonzoms-ui-zk/src/main/webapp/companyPage.zul 2010-07-16 15:34:30 UTC (rev 106) @@ -5,7 +5,7 @@ <window id="company" apply="org.chorem.bonzoms.ui.CompanyController"> Companies: <toolbarbutton id="newCompany" label="Add new company" /> <listbox autopaging="true" mold="paging" id="companyListBox" rows="20" model="@{company$composer.companyModel}" - itemRenderer="@{company$composer.companyRenderer}"> + itemRenderer="@{company$composer.companyDataRenderer}"> <listhead> <listheader label="Name" /> <listheader label="Web site" /> Added: trunk/bonzoms-ui-zk/src/main/webapp/contractFormPage.zul =================================================================== --- trunk/bonzoms-ui-zk/src/main/webapp/contractFormPage.zul (rev 0) +++ trunk/bonzoms-ui-zk/src/main/webapp/contractFormPage.zul 2010-07-16 15:34:30 UTC (rev 106) @@ -0,0 +1,71 @@ +<?page id="ContractForm" title="Contract form" cacheable="false" language="xul/html" zscriptLanguage="Java"?> +<?meta content="text/html; charset=UTF-8" pageEncoding="UTF-8"?> + +<window closable="true" maximizable="true" sizable="true" height="500px" width="450px" contentStyle="overflow:auto" apply="org.chorem.bonzoms.ui.ContractFormController"> +<caption label="Contract"/> + + <groupbox> + <caption label="Contracts informations" /> + + <hbox> + + <vbox> + + <listbox id="contractListbox" model="@{composer.contractsModel}" width="400px"> + <listitem self="@{each='contract'}"> + <listcell> + <groupbox> + <caption label="@{contract.type}" /> + + <hbox> + + <vbox> + + <label value="Type" /> + <textbox value="@{contract.type, save-when='save.onClick'}" /> + + <label value="Salary" /> + <doublebox value="@{contract.salary, save-when='save.onClick'}" /> + + <label value="Working time" /> + <textbox value="@{contract.workingTime, save-when='save.onClick'}" /> + + <label value="Advantages" /> + <textbox value="@{contract.advantages, save-when='save.onClick'}" /> + + </vbox> + + <space /> + + <vbox> + <label value="Name" /> + <textbox value="@{contract.name, save-when='save.onClick'}" /> + + <label value="Start" /> + <datebox value="@{contract.start, save-when='save.onClick'}" /> + + <label value="End" /> + <datebox value="@{contract.start, save-when='save.onClick'}" /> + + <label value="Description" /> + <textbox rows="5" value="@{contract.description, save-when='save.onClick'}" /> + + </vbox> + + </hbox> + </groupbox> + </listcell> + </listitem> + </listbox> + <hbox> + <button label="Add contract" id="addContract" /> + <button label="Delete contract" id="deleteContract" /> + </hbox> + + </vbox> + + </hbox> + </groupbox> + <button id="save" label="save" /> + +</window> \ No newline at end of file Modified: trunk/bonzoms-ui-zk/src/main/webapp/employeeFormPage.zul =================================================================== --- trunk/bonzoms-ui-zk/src/main/webapp/employeeFormPage.zul 2010-07-15 12:16:36 UTC (rev 105) +++ trunk/bonzoms-ui-zk/src/main/webapp/employeeFormPage.zul 2010-07-16 15:34:30 UTC (rev 106) @@ -9,32 +9,32 @@ <hbox> <vbox> <label value="email" /> - <textbox value="@{composer.employee.workingEmail, save-when='self.onChange'}" /> + <textbox value="@{composer.employeeData.employee.workingEmail, save-when='saveEmployee.onClick'}" constraint="/.+@.+\.[a-z]+/" /> <label value="Phone number" /> - <textbox value="@{composer.employee.workingPhone, save-when='self.onChange'}" /> + <textbox value="@{composer.employeeData.employee.workingPhone, save-when='saveEmployee.onClick'}" /> <separator /> - <toolbarbutton id="newContract" label="Add new contract" /> + <toolbarbutton id="editContracts" label="Edit contracts" /> <separator /> - <toolbarbutton id="newService" label="Add new service" /> + <toolbarbutton id="editService" label="Edit service" /> </vbox> <groupbox> <caption label="Working address" /> <vbox> <label value="Adress1" /> - <textbox value="@{composer.workingAddress.address1, save-when='self.onChange'}" /> + <textbox value="@{composer.employeeData.workingAddress.address1, save-when='saveEmployee.onClick'}" /> <label value="Adress2" /> - <textbox value="@{composer.workingAddress.address2, save-when='self.onChange'}" /> + <textbox value="@{composer.employeeData.workingAddress.address2, save-when='saveEmployee.onClick'}" /> <label value="Zip code" /> - <textbox value="@{composer.workingAddress.zipCode, save-when='self.onChange'}" /> + <textbox value="@{composer.employeeData.workingAddress.zipCode, save-when='saveEmployee.onClick'}" /> <label value="City" /> - <textbox value="@{composer.workingAddress.city, save-when='self.onChange'}" /> + <textbox value="@{composer.employeeData.workingAddress.city, save-when='saveEmployee.onClick'}" /> <label value="Country" /> - <textbox value="@{composer.workingAddress.country, save-when='self.onChange'}" /> + <textbox value="@{composer.employeeData.workingAddress.country, save-when='saveEmployee.onClick'}" /> </vbox> </groupbox> </hbox> @@ -47,66 +47,72 @@ <hbox> <vbox> <label value="First name" /> - <textbox value="@{composer.employee.firstName, save-when='self.onChange'}" /> + <textbox value="@{composer.employeeData.person.firstName, save-when='saveEmployee.onClick'}" /> <label value="Last name" /> - <textbox value="@{composer.employee.lastName, save-when='self.onChange'}" /> + <textbox value="@{composer.employeeData.person.lastName, save-when='saveEmployee.onClick'}" /> <label value="Birthday" /> - <datebox value="@{composer.employee.birthDay, save-when='self.onChange'}" /> - <label value="Email" /> - <textbox value="@{composer.employee.workingEmail, save-when='self.onChange'}" constraint="/.+@.+\.[a-z]+/" /> - <hbox> - <button label="Add address " id="addAddress" /> <button label="Delete address" id="deleteAddress" /> - </hbox> + <datebox value="@{composer.employeeData.person.birthDay, save-when='saveEmployee.onClick'}" /> </vbox> - <listbox id="addressListbox" model="@{composer.addressesModel}" width="200px"> - <listitem self="@{each='address'}"> - <listcell> - <groupbox> - <caption label="@{address.name}" /> - <vbox> + <space /> - <label value="Name" /> - <textbox value="@{address.name, save-when='self.onChange'}" /> + <vbox> + <listbox id="addressListbox" model="@{composer.employeeData.personAddressesModel}" width="200px"> + <listitem self="@{each='address'}"> + <listcell> + <groupbox> + <caption label="@{address.name}" /> + <vbox> - <label value="Adress1" /> - <textbox value="@{address.address1, save-when='self.onChange'}" /> + <label value="Name" /> + <textbox value="@{address.name, save-when='saveEmployee.onClick'}" /> - <label value="Adress2" /> - <textbox value="@{address.address2, save-when='self.onChange'}" /> + <label value="Adress1" /> + <textbox value="@{address.address1, save-when='saveEmployee.onClick'}" /> - <label value="Zip code" /> - <textbox value="@{address.zipCode, save-when='self.onChange'}" /> + <label value="Adress2" /> + <textbox value="@{address.address2, save-when='saveEmployee.onClick'}" /> - <label value="City" /> - <textbox value="@{address.city, save-when='self.onChange'}" /> + <label value="Zip code" /> + <textbox value="@{address.zipCode, save-when='saveEmployee.onClick'}" /> - <label value="Country" /> - <textbox value="@{address.country, save-when='self.onChange'}" /> + <label value="City" /> + <textbox value="@{address.city, save-when='saveEmployee.onClick'}" /> - </vbox> - </groupbox> - </listcell> - </listitem> - </listbox> + <label value="Country" /> + <textbox value="@{address.country, save-when='saveEmployee.onClick'}" /> + + </vbox> + </groupbox> + </listcell> + </listitem> + </listbox> + <hbox> + <button label="Add address " id="addAddress" /> + <button label="Delete address" id="deleteAddress" /> + </hbox> + </vbox> + </hbox> + <separator/> + <vbox> <groupbox width="330px"> <caption label="Phones" /> - <listbox id="phoneListbox" model="@{composer.phonesModel}" width="310px"> + <listbox id="phoneListbox" model="@{composer.employeeData.personPhonesModel}" width="310px"> <listhead sizable="true"> <listheader label="Name" /> <listheader label="Phone Number" /> </listhead> <listitem self="@{each='phone'}"> <listcell> - <textbox value="@{phone.name, save-when='self.onChange'}" /> + <textbox value="@{phone.name, save-when='saveEmployee.onClick'}" /> </listcell> <listcell> - <textbox value="@{phone.number, save-when='self.onChange'}" /> + <textbox value="@{phone.phone, save-when='saveEmployee.onClick'}" /> </listcell> </listitem> </listbox> @@ -117,21 +123,23 @@ </groupbox> + <separator/> + <groupbox width="330px"> <caption label="Emails" /> - <listbox id="emailListbox" model="@{composer.emailsModel}" width="310px"> + <listbox id="emailListbox" model="@{composer.employeeData.personEmailsModel}" width="310px"> <listhead sizable="true"> <listheader label="Name" /> <listheader label="Email" /> </listhead> <listitem self="@{each='mail'}"> <listcell> - <textbox value="@{mail.name, save-when='self.onChange'}" /> + <textbox value="@{mail.name, save-when='saveEmployee.onClick'}" /> </listcell> <listcell> - <textbox value="@{mail.mail, save-when='self.onChange'}" /> + <textbox value="@{mail.email, save-when='saveEmployee.onClick'}" /> </listcell> </listitem> </listbox> @@ -144,4 +152,5 @@ </vbox> </groupbox> + <button id="saveEmployee" label="Save" /> </window> \ No newline at end of file Modified: trunk/bonzoms-ui-zk/transaction.log =================================================================== --- trunk/bonzoms-ui-zk/transaction.log 2010-07-15 12:16:36 UTC (rev 105) +++ trunk/bonzoms-ui-zk/transaction.log 2010-07-16 15:34:30 UTC (rev 106) @@ -390,3 +390,45 @@ 2010-07-13 10:42:09,154 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_1] - Starting service com.arjuna.ats.arjuna.recovery.ActionStatusService on port 52569 2010-07-13 10:42:09,156 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.internal.arjuna.recovery.TransactionStatusManagerItem_5] - TransactionStatusManagerItem host: 127.0.0.1 port: 52 569 2010-07-13 10:42:09,230 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 52569 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService +2010-07-16 10:31:49,226 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_1] - Starting service com.arjuna.ats.arjuna.recovery.ActionStatusService on port 60791 +2010-07-16 10:31:49,258 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.internal.arjuna.recovery.TransactionStatusManagerItem_5] - TransactionStatusManagerItem host: 127.0.0.1 port: 60 791 +2010-07-16 10:31:49,337 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 60791 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService +2010-07-16 10:34:07,524 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_1] - Starting service com.arjuna.ats.arjuna.recovery.ActionStatusService on port 54226 +2010-07-16 10:34:07,526 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.internal.arjuna.recovery.TransactionStatusManagerItem_5] - TransactionStatusManagerItem host: 127.0.0.1 port: 54 226 +2010-07-16 10:34:07,578 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 54226 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService +2010-07-16 10:40:18,457 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_1] - Starting service com.arjuna.ats.arjuna.recovery.ActionStatusService on port 51345 +2010-07-16 10:40:18,459 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.internal.arjuna.recovery.TransactionStatusManagerItem_5] - TransactionStatusManagerItem host: 127.0.0.1 port: 51 345 +2010-07-16 10:40:18,515 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 51345 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService +2010-07-16 15:07:15,442 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_1] - Starting service com.arjuna.ats.arjuna.recovery.ActionStatusService on port 43368 +2010-07-16 15:07:15,446 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.internal.arjuna.recovery.TransactionStatusManagerItem_5] - TransactionStatusManagerItem host: 127.0.0.1 port: 43 368 +2010-07-16 15:07:15,503 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 43368 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService +2010-07-16 15:13:33,827 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_1] - Starting service com.arjuna.ats.arjuna.recovery.ActionStatusService on port 47957 +2010-07-16 15:13:33,830 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.internal.arjuna.recovery.TransactionStatusManagerItem_5] - TransactionStatusManagerItem host: 127.0.0.1 port: 47 957 +2010-07-16 15:13:33,900 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 47957 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService +2010-07-16 15:16:26,980 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_1] - Starting service com.arjuna.ats.arjuna.recovery.ActionStatusService on port 52547 +2010-07-16 15:16:26,983 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.internal.arjuna.recovery.TransactionStatusManagerItem_5] - TransactionStatusManagerItem host: 127.0.0.1 port: 52 547 +2010-07-16 15:16:27,046 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 52547 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService +2010-07-16 15:20:45,558 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_1] - Starting service com.arjuna.ats.arjuna.recovery.ActionStatusService on port 36830 +2010-07-16 15:20:45,560 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.internal.arjuna.recovery.TransactionStatusManagerItem_5] - TransactionStatusManagerItem host: 127.0.0.1 port: 36 830 +2010-07-16 15:20:45,644 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 36830 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService +2010-07-16 15:23:42,744 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_1] - Starting service com.arjuna.ats.arjuna.recovery.ActionStatusService on port 39169 +2010-07-16 15:23:42,747 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.internal.arjuna.recovery.TransactionStatusManagerItem_5] - TransactionStatusManagerItem host: 127.0.0.1 port: 39 169 +2010-07-16 15:23:42,814 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 39169 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService +2010-07-16 15:24:43,201 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_1] - Starting service com.arjuna.ats.arjuna.recovery.ActionStatusService on port 50179 +2010-07-16 15:24:43,202 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.internal.arjuna.recovery.TransactionStatusManagerItem_5] - TransactionStatusManagerItem host: 127.0.0.1 port: 50 179 +2010-07-16 15:24:43,241 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 50179 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService +2010-07-16 15:25:33,175 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_1] - Starting service com.arjuna.ats.arjuna.recovery.ActionStatusService on port 60635 +2010-07-16 15:25:33,177 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.internal.arjuna.recovery.TransactionStatusManagerItem_5] - TransactionStatusManagerItem host: 127.0.0.1 port: 60 635 +2010-07-16 15:25:33,230 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 60635 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService +2010-07-16 15:27:17,492 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_1] - Starting service com.arjuna.ats.arjuna.recovery.ActionStatusService on port 34071 +2010-07-16 15:27:17,495 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.internal.arjuna.recovery.TransactionStatusManagerItem_5] - TransactionStatusManagerItem host: 127.0.0.1 port: 34 071 +2010-07-16 15:27:17,551 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 34071 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService +2010-07-16 15:29:02,862 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_1] - Starting service com.arjuna.ats.arjuna.recovery.ActionStatusService on port 38098 +2010-07-16 15:29:02,864 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.internal.arjuna.recovery.TransactionStatusManagerItem_5] - TransactionStatusManagerItem host: 127.0.0.1 port: 38 098 +2010-07-16 15:29:02,909 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 38098 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService +2010-07-16 16:20:03,761 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_1] - Starting service com.arjuna.ats.arjuna.recovery.ActionStatusService on port 59447 +2010-07-16 16:20:03,763 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.internal.arjuna.recovery.TransactionStatusManagerItem_5] - TransactionStatusManagerItem host: 127.0.0.1 port: 59 447 +2010-07-16 16:20:03,827 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 59447 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService +2010-07-16 16:38:52,518 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_1] - Starting service com.arjuna.ats.arjuna.recovery.ActionStatusService on port 41080 +2010-07-16 16:38:52,519 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.internal.arjuna.recovery.TransactionStatusManagerItem_5] - TransactionStatusManagerItem host: 127.0.0.1 port: 41 080 +2010-07-16 16:38:52,566 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 41080 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService