[Bonzoms-commits] r119 - in trunk/bonzoms-ui-zk/src/main: java/org/chorem/bonzoms/ui webapp

26 Jul 2010

Author: bbrossaud
Date: 2010-07-26 16:15:05 +0200 (Mon, 26 Jul 2010)
New Revision: 119

Url: http://chorem.org/repositories/revision/bonzoms/119

Log:
addition contract page

Added:
   trunk/bonzoms-ui-zk/src/main/webapp/contractPage.zul
Removed:
   trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/FieldExtension.java
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/CompanyController.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/ContractsFormController.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/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/EmployeeModel.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/PhonesModel.java
   trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ResultController.java
   trunk/bonzoms-ui-zk/src/main/webapp/index.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/AddressesModel.java	2010-07-23 15:42:22 UTC (rev 118)
+++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/AddressesModel.java	2010-07-26 14:15:05 UTC (rev 119)
@@ -36,36 +36,36 @@
  */
 public class AddressesModel extends AbstractListModel implements BindingListModel {
 
-    List<Address> _addresses = new ArrayList<Address>();
+    List<Address> addresses = new ArrayList<Address>();
 
     @Override
     public Object getElementAt(int index) {
-        return _addresses.get(index);
+        return addresses.get(index);
     }
 
     @Override
     public int getSize() {
-        return _addresses.size();
+        return addresses.size();
     }
 
     @Override
     public int indexOf(Object obj) {
-        return _addresses.indexOf(obj);
+        return addresses.indexOf(obj);
     }
 
     public void setAddresses(List<Address> addresses) {
-        _addresses = addresses;
+        this.addresses = addresses;
         fireEvent(ListDataEvent.CONTENTS_CHANGED, -1, -1);
     }
 
     public void addData(Address newData) {
-        _addresses.add(newData);
-        fireEvent(ListDataEvent.INTERVAL_ADDED, _addresses.size() - 1, _addresses.size() - 1);
+        addresses.add(newData);
+        fireEvent(ListDataEvent.INTERVAL_ADDED, addresses.size() - 1, addresses.size() - 1);
     }
 
     public void removeData(Address data) {
-        int interval = _addresses.indexOf(data);
-        _addresses.remove(data);
+        int interval = addresses.indexOf(data);
+        addresses.remove(data);
         fireEvent(ListDataEvent.INTERVAL_REMOVED, interval, interval);
     }
 
@@ -74,6 +74,6 @@
     }
 
     public List<Address> getAddresses() {
-        return _addresses;
+        return addresses;
     }
 }

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-23 15:42:22 UTC (rev 118)
+++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/CompanyController.java	2010-07-26 14:15:05 UTC (rev 119)
@@ -48,9 +48,9 @@
  * @author sherkhan
  */
 public class CompanyController extends GenericForwardComposer {
-    protected Model _model = new Model();
+    protected Model model = new Model();
 
-    protected CompanyModel _companyDataModel = new CompanyModel();
+    protected CompanyModel companyDataModel = new CompanyModel();
 
     @Override
     public void doAfterCompose(Component comp) throws Exception {
@@ -58,18 +58,18 @@
         String search = (String) arg.get("search");
         List<Company> companies;
         if (search != null && !search.isEmpty()) {
-            companies = _model.retrieveCompaniesBySearch(search);
+            companies = model.retrieveCompaniesBySearch(search);
         } else {
-            companies = _model.retrieveAllCompanies();
+            companies = model.retrieveAllCompanies();
         }
         createCompaniesData(companies);
     }
 
     public void createCompaniesData(List<Company> companies) {
         for (Company company: companies) {
-            List<Address> addresses = _model.retrieveAddressesByIds(new ArrayList<String>(company.getAddress()));
+            List<Address> addresses = model.retrieveAddressesByIds(new ArrayList<String>(company.getAddress()));
             CompanyData data = new CompanyData(company, addresses);
-            _companyDataModel.addData(data);
+            companyDataModel.addData(data);
         }
     }
 
@@ -86,11 +86,11 @@
             public void onEvent(Event event) throws Exception {
                 CompanyData data = (CompanyData) event.getData();
                 if (data != null) {
-                    int rowIndex = _companyDataModel.indexOf(data);
+                    int rowIndex = companyDataModel.indexOf(data);
                     if (rowIndex == -1) {
-                        _companyDataModel.addData(data);
+                        companyDataModel.addData(data);
                     } else {
-                        _companyDataModel.reloadContent(rowIndex);
+                        companyDataModel.reloadContent(rowIndex);
                     }
                 }
             }
@@ -209,6 +209,6 @@
      * Getters
      */
     public CompanyModel getCompanyModel() {
-        return _companyDataModel;
+        return companyDataModel;
     }
 }

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-23 15:42:22 UTC (rev 118)
+++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/CompanyFormController.java	2010-07-26 14:15:05 UTC (rev 119)
@@ -41,9 +41,9 @@
  */
 public class CompanyFormController extends GenericForwardComposer {
     
-    protected Model _model = new Model();
+    protected Model model = new Model();
 
-    protected CompanyData _companyData = new CompanyData();
+    protected CompanyData companyData = new CompanyData();
 
     protected Listbox addressListbox;
     protected Listbox phoneListbox;
@@ -71,49 +71,49 @@
 
     protected void initDefaultCompany() {
          Address address = new AddressImpl();
-        _companyData.getAddressesModel().addData(address);
+        companyData.getAddressesModel().addData(address);
 
         Phone phone = new Phone();
-        _companyData.getPhonesModel().addData(phone);
+        companyData.getPhonesModel().addData(phone);
 
         Email email = new Email();
-        _companyData.getEmailsModel().addData(email);
+        companyData.getEmailsModel().addData(email);
     }
 
     protected void initCompany(CompanyData companyData) {
-        _companyData = companyData;
-        List<Address> addresses = _model.retrieveAddressesByIds(new ArrayList<String>(companyData.getCompany().getAddress()));
-        _companyData.setAddresses(addresses);
-        _companyData.setEmailsModelList(_companyData.getCompany().getEmails());
-        _companyData.setPhonesModelList(_companyData.getCompany().getPhones());
+        this.companyData = companyData;
+        List<Address> addresses = model.retrieveAddressesByIds(new ArrayList<String>(companyData.getCompany().getAddress()));
+        companyData.setAddresses(addresses);
+        companyData.setEmailsModelList(companyData.getCompany().getEmails());
+        companyData.setPhonesModelList(companyData.getCompany().getPhones());
     }
 
     protected void removeCompanyAddresses() {
-        List<String> ids = _companyData.getRemovedAddresses();
+        List<String> ids = companyData.getRemovedAddresses();
         for (String id : ids) {
-            _companyData.getCompany().removeAddress(id);
+            companyData.getCompany().removeAddress(id);
         }
     }
 
     protected void saveAddresses() {
-        List<Address> addresses = _model.createAddresses(_companyData.getAddressesModel().getAddresses());
-        if (!_companyData.getRemovedAddresses().isEmpty()) {
-            _model.deleteAddressesByIds(_companyData.getRemovedAddresses());
+        List<Address> addresses = model.createAddresses(companyData.getAddressesModel().getAddresses());
+        if (!companyData.getRemovedAddresses().isEmpty()) {
+            model.deleteAddressesByIds(companyData.getRemovedAddresses());
             removeCompanyAddresses();
         }
         for (Address address : addresses) {
-            _companyData.getCompany().addAddress(address.getWikittyId());
+            companyData.getCompany().addAddress(address.getWikittyId());
         }
     }
 
     protected void saveEmails() {
-        String emails = _companyData.getEmailsModelAsString();
-        _companyData.getCompany().setEmails(emails);
+        String emails = companyData.getEmailsModelAsString();
+        companyData.getCompany().setEmails(emails);
     }
 
     protected void savePhones() {
-        String phones = _companyData.getPhonesModelAsString();
-        _companyData.getCompany().setPhones(phones);
+        String phones = companyData.getPhonesModelAsString();
+        companyData.getCompany().setPhones(phones);
     }
 
     /*
@@ -121,44 +121,44 @@
      */
     public void onClick$addAddress() {
         Address address = new AddressImpl();
-        _companyData.getAddressesModel().addData(address);
+        companyData.getAddressesModel().addData(address);
     }
 
     public void onClick$deleteAddress() {
        int size = addressListbox.getItemCount();
         if (size > 1) {
-            Address address = (Address) _companyData.getAddressesModel().getElementAt(size -1);
-            _companyData.getAddressesModel().removeData(address);
+            Address address = (Address) companyData.getAddressesModel().getElementAt(size -1);
+            companyData.getAddressesModel().removeData(address);
             String id = address.getWikittyId();
             if (!id.isEmpty()) {
-                _companyData.getRemovedAddresses().add(id);
+                companyData.getRemovedAddresses().add(id);
             }
         }
     }
 
     public void onClick$addPhone() {
         Phone phone = new Phone();
-        _companyData.getPhonesModel().addData(phone);
+        companyData.getPhonesModel().addData(phone);
     }
 
     public void onClick$deletePhone() {
         int size = phoneListbox.getItemCount();
         if (size > 1) {
-            Phone phone = (Phone) _companyData.getPhonesModel().getElementAt(size -1);
-            _companyData.getPhonesModel().removeData(phone);
+            Phone phone = (Phone) companyData.getPhonesModel().getElementAt(size -1);
+            companyData.getPhonesModel().removeData(phone);
         }
     }
 
     public void onClick$addEmail() {
         Email email = new Email();
-        _companyData.getEmailsModel().addData(email);
+        companyData.getEmailsModel().addData(email);
     }
 
     public void onClick$deleteEmail() {
         int size = emailListbox.getItemCount();
         if (size > 1) {
-            Email email = (Email) _companyData.getEmailsModel().getElementAt(size - 1);
-            _companyData.getEmailsModel().removeData(email);
+            Email email = (Email) companyData.getEmailsModel().getElementAt(size - 1);
+            companyData.getEmailsModel().removeData(email);
         }
     }
 
@@ -167,11 +167,11 @@
         saveEmails();
         saveAddresses();
 
-        Company company = _model.updateCompany(_companyData.getCompany());
+        Company company = model.updateCompany(companyData.getCompany());
         
-        _companyData.setCompany(company);
+        companyData.setCompany(company);
 
-        Events.postEvent(EVENT_ON_SAVE_COMPANY, this.self, _companyData);
+        Events.postEvent(EVENT_ON_SAVE_COMPANY, this.self, companyData);
 
         this.self.detach();
     }
@@ -180,6 +180,6 @@
      * Getters
      */
     public CompanyData getCompanyData() {
-        return _companyData;
+        return companyData;
     }
 }

Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ContractsFormController.java
===================================================================
--- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ContractsFormController.java	2010-07-23 15:42:22 UTC (rev 118)
+++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ContractsFormController.java	2010-07-26 14:15:05 UTC (rev 119)
@@ -67,19 +67,19 @@
         }
     }
 
-    public void onClick$save() {
+    public void onClick$saveContracts() {
         Events.postEvent(EVENT_ON_SAVE_CONTRACTS, this.self, contractsData);
         self.detach();
     }
 
+    public void onClose() {
+        contractsData.setContractsList(save);
+    }
+
     /*
      * Getters
      */
     public ContractsModel getContractsModel() {
         return contractsData.getContractsModel();
     }
-
-    public void onClose() {
-        contractsData.setContractsList(save);
-    }
 }

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-23 15:42:22 UTC (rev 118)
+++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ContractsModel.java	2010-07-26 14:15:05 UTC (rev 119)
@@ -36,44 +36,48 @@
  */
 public class ContractsModel extends AbstractListModel implements BindingListModel {
 
-    List<EmploymentContract> _contracts = new ArrayList<EmploymentContract>();
+    List<EmploymentContract> contracts = new ArrayList<EmploymentContract>();
 
     @Override
     public Object getElementAt(int index) {
-        return _contracts.get(index);
+        return contracts.get(index);
     }
 
     @Override
     public int getSize() {
-        return _contracts.size();
+        return contracts.size();
     }
 
     @Override
     public int indexOf(Object obj) {
-        return _contracts.indexOf(obj);
+        return contracts.indexOf(obj);
     }
 
     public void setContracts(List<EmploymentContract> contracts) {
-        _contracts = contracts;
+        this.contracts = contracts;
         fireEvent(ListDataEvent.CONTENTS_CHANGED, -1, -1);
     }
 
     public void addData(EmploymentContract newData) {
-        _contracts.add(newData);
-        fireEvent(ListDataEvent.INTERVAL_ADDED, _contracts.size() - 1, _contracts.size() - 1);
+        contracts.add(newData);
+        fireEvent(ListDataEvent.INTERVAL_ADDED, contracts.size() - 1, contracts.size() - 1);
     }
 
     public void removeData(EmploymentContract data) {
-        int interval = _contracts.indexOf(data);
-        _contracts.remove(data);
+        int interval = contracts.indexOf(data);
+        contracts.remove(data);
         fireEvent(ListDataEvent.INTERVAL_REMOVED, interval, interval);
     }
 
+    public void reloadContent(int rowIndex) {
+        fireEvent(ListDataEvent.CONTENTS_CHANGED, rowIndex, rowIndex);
+    }
+
     public void reload() {
         fireEvent(ListDataEvent.CONTENTS_CHANGED, -1, -1);
     }
 
     public List<EmploymentContract> getContracts() {
-        return _contracts;
+        return contracts;
     }
 }

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-23 15:42:22 UTC (rev 118)
+++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/EmailsModel.java	2010-07-26 14:15:05 UTC (rev 119)
@@ -36,36 +36,36 @@
  */
 public class EmailsModel extends AbstractListModel implements BindingListModel {
 
-    List<Email> _emails = new ArrayList<Email>();
+    List<Email> emails = new ArrayList<Email>();
 
     @Override
     public Object getElementAt(int index) {
-        return _emails.get(index);
+        return emails.get(index);
     }
 
     @Override
     public int getSize() {
-        return _emails.size();
+        return emails.size();
     }
 
     @Override
     public int indexOf(Object obj) {
-        return _emails.indexOf(obj);
+        return emails.indexOf(obj);
     }
 
-    public void setEmails(List<Email> Emailes) {
-        _emails = Emailes;
+    public void setEmails(List<Email> emails) {
+        this.emails = emails;
         fireEvent(ListDataEvent.CONTENTS_CHANGED, -1, -1);
     }
 
     public void addData(Email newData) {
-        _emails.add(newData);
-        fireEvent(ListDataEvent.INTERVAL_ADDED, _emails.size() - 1, _emails.size() - 1);
+        emails.add(newData);
+        fireEvent(ListDataEvent.INTERVAL_ADDED, emails.size() - 1, emails.size() - 1);
     }
 
     public void removeData(Email data) {
-        int interval = _emails.indexOf(data);
-        _emails.remove(data);
+        int interval = emails.indexOf(data);
+        emails.remove(data);
         fireEvent(ListDataEvent.INTERVAL_REMOVED, interval, interval);
     }
 
@@ -74,33 +74,33 @@
     }
 
     public List<Email> getEmails() {
-        return _emails;
+        return emails;
     }
 
     public String getEmailsAsString() {
-        String emails = "";
-        for (Email email : _emails) {
+        String mails = "";
+        for (Email email : this.emails) {
             if (!email.isEmpty()) {
-                emails += email.getName() + ":" + email.getEmail() + ";";
+                mails += email.getName() + ":" + email.getEmail() + ";";
             }
         }
-        return emails;
+        return mails;
     }
 
     public void setEmails(String str) {
-        _emails.clear();
-        String[] emails = StringUtil.split(str, ";");
-        for (String email : emails) {
+        emails.clear();
+        String[] mails = StringUtil.split(str, ";");
+        for (String email : mails) {
             String[] values = StringUtil.split(email, ":");
             String mail = "";
             if (values.length > 1) {
                 mail = values[1];
             }
             Email newEmail = new Email(values[0], mail);
-            _emails.add(newEmail);
+            this.emails.add(newEmail);
         }
-        if (_emails.isEmpty()) {
-            _emails.add(new Email());
+        if (this.emails.isEmpty()) {
+            this.emails.add(new Email());
         }
         fireEvent(ListDataEvent.CONTENTS_CHANGED, -1, -1);
     }

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-23 15:42:22 UTC (rev 118)
+++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/EmployeeController.java	2010-07-26 14:15:05 UTC (rev 119)
@@ -49,34 +49,27 @@
  */
 public class EmployeeController extends GenericForwardComposer {
 
-    protected Model _model = new Model();
-    protected EmployeeModel _employeeModel = new EmployeeModel();
-    protected Employee _selectedEmployee = null;
+    protected Model model = new Model();
+    protected EmployeeModel employeeModel = new EmployeeModel();
 
     @Override
     public void doAfterCompose(Component comp) throws Exception {
         super.doAfterCompose(comp);
-        String search = (String) arg.get("search");
-        List<Employee> employees;
-        if (search != null && !search.isEmpty()) {
-            employees = _model.retrieveEmployeesBySearch(search);
-        } else {
-            employees = _model.retrieveAllEmployees();
-        }
+        List<Employee> employees = model.retrieveAllEmployees();
         createEmployeeDataList(employees);
     }
 
     public void createEmployeeDataList(List<Employee> employees) {
         for (Employee employee : employees) {
-            Address address = _model.retrieveAddressById(employee.getAddress());
+            Address address = model.retrieveAddressById(employee.getAddress());
             EmployeeData data = new EmployeeData(employee, address);
 
-            Person person = _model.retrievePersonById(employee.getPerson());
+            Person person = model.retrievePersonById(employee.getPerson());
             if (person != null) {
                 PersonData personData = new PersonData(person, null);
                 data.setPersonData(personData);
             }
-            _employeeModel.addData(data);
+            employeeModel.addData(data);
         }
     }
 
@@ -93,11 +86,11 @@
             public void onEvent(Event event) throws Exception {
                 EmployeeData data = (EmployeeData) event.getData();
                 if (data != null) {
-                    int rowIndex = _employeeModel.indexOf(data);
+                    int rowIndex = employeeModel.indexOf(data);
                     if (rowIndex == -1) {
-                        _employeeModel.addData(data);
+                        employeeModel.addData(data);
                     } else {
-                        _employeeModel.reloadContent(rowIndex);
+                        employeeModel.reloadContent(rowIndex);
                     }
                 }
             }
@@ -170,18 +163,11 @@
         return createEvent.getArg();
     }
 
-    public Employee getSelectedEmployee() {
-        return _selectedEmployee;
-    }
-
     public EmployeeModel getEmployeeModel() {
-        return _employeeModel;
+        return employeeModel;
     }
 
     /*
      * Setters
      */
-    public void setSelectedEmployee(Employee employee) {
-        _selectedEmployee = employee;
-    }
 }

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-23 15:42:22 UTC (rev 118)
+++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/EmployeeModel.java	2010-07-26 14:15:05 UTC (rev 119)
@@ -34,36 +34,36 @@
  * @author sherkhan
  */
 public class EmployeeModel extends AbstractListModel implements BindingListModel {
- protected List<EmployeeData> _employees = new ArrayList<EmployeeData>();
+ protected List<EmployeeData> employees = new ArrayList<EmployeeData>();
 
     @Override
     public Object getElementAt(int index) {
-        return _employees.get(index);
+        return employees.get(index);
     }
 
     @Override
     public int getSize() {
-        return _employees.size();
+        return employees.size();
     }
 
     @Override
     public int indexOf(Object obj) {
-        return _employees.indexOf(obj);
+        return employees.indexOf(obj);
     }
 
     public void setEmployees(List<EmployeeData> employees) {
-        _employees = employees;
+        this.employees = employees;
         fireEvent(ListDataEvent.CONTENTS_CHANGED, -1, -1);
     }
 
     public void addData(EmployeeData newData) {
-        _employees.add(newData);
-        fireEvent(ListDataEvent.INTERVAL_ADDED, _employees.size() - 1, _employees.size() - 1);
+        employees.add(newData);
+        fireEvent(ListDataEvent.INTERVAL_ADDED, employees.size() - 1, employees.size() - 1);
     }
 
     public void removeData(EmployeeData data) {
-        int interval = _employees.indexOf(data);
-        _employees.remove(data);
+        int interval = employees.indexOf(data);
+        employees.remove(data);
         fireEvent(ListDataEvent.INTERVAL_REMOVED, interval, interval);
     }
 

Deleted: 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-23 15:42:22 UTC (rev 118)
+++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/FieldExtension.java	2010-07-26 14:15:05 UTC (rev 119)
@@ -1,88 +0,0 @@
-/*
- * #%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.
- */
-package org.chorem.bonzoms.ui;
-
-import java.util.List;
-import org.nuiton.wikitty.FieldType;
-import org.nuiton.wikitty.WikittyExtension;
-
-/**
- *
- * @author sherkhan
- */
-public class FieldExtension {
-
-    protected FieldType _fieldType;
-    protected List<FieldExtension> _fieldExtensions = null;
-    protected String _name;
-    protected WikittyExtension _wikittyExtension;
-
-    public FieldExtension(FieldType fieldType, String name, WikittyExtension wikittyExtension) {
-        _name = name;
-        _fieldType = fieldType;
-        _wikittyExtension = wikittyExtension;
-    }
-
-    /*
-     * Setters
-     */
-    public void setName(String name) {
-        _name = name;
-    }
-
-    public void setType(FieldType fieldType) {
-        _fieldType = fieldType;
-    }
-
-    public void setWikittyExtension(WikittyExtension wikittyExtension) {
-        _wikittyExtension = wikittyExtension;
-    }
-
-    public void setFieldExtensions(List<FieldExtension> fieldExtensions) {
-        _fieldExtensions = fieldExtensions;
-    }
-
-    /*
-     * Getters
-     */
-    public String getName() {
-        return _name;
-    }
-
-    public FieldType getFieldType() {
-        return _fieldType;
-    }
-
-    public WikittyExtension getWikittyExtension() {
-        return _wikittyExtension;
-    }
-
-    public List<FieldExtension> getFieldExtensions() {
-        return _fieldExtensions;
-    }
-}

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-23 15:42:22 UTC (rev 118)
+++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/MainController.java	2010-07-26 14:15:05 UTC (rev 119)
@@ -48,33 +48,39 @@
     @Override
     public void doAfterCompose(Component comp) throws Exception {
         super.doAfterCompose(comp);
-        createEmployeesPage(null);
+        createEmployeesPage();
     }
 
-    protected void createEmployeesPage(Map<String, Object> map) {
+    protected void createEmployeesPage() {
         removeAllContentPage();
-        Component newContent = Executions.createComponents("employeePage.zul", null, map);
+        Component newContent = Executions.createComponents("employeePage.zul", null, null);
         content.appendChild(newContent);
     }
 
-    protected void createPersonsPage(Map<String, Object> map) {
+    protected void createPersonsPage() {
         removeAllContentPage();
-        Component newContent = Executions.createComponents("personPage.zul", null, map);
+        Component newContent = Executions.createComponents("personPage.zul", null, null);
         content.appendChild(newContent);
     }
 
-    protected void createCompaniesPage(Map<String, Object> map) {
+    protected void createCompaniesPage() {
         removeAllContentPage();
-        Component newContent = Executions.createComponents("companyPage.zul", null, map);
+        Component newContent = Executions.createComponents("companyPage.zul", null, null);
         content.appendChild(newContent);
     }
 
-    protected void createServicesPage(Map<String, Object> map) {
+    protected void createServicesPage() {
         removeAllContentPage();
-        Component newContent = Executions.createComponents("servicePage.zul", null, map);
+        Component newContent = Executions.createComponents("servicePage.zul", null, null);
         content.appendChild(newContent);
     }
 
+    protected void createContractsPage() {
+        removeAllContentPage();
+        Component newContent = Executions.createComponents("contractPage.zul", null, null);
+        content.appendChild(newContent);
+    }
+
     protected void removeAllContentPage() {
         content.getLastChild().detach();
     }
@@ -114,18 +120,22 @@
     }
 
     public void onClick$employees() {
-        createEmployeesPage(new HashMap<String, Object>());
+        createEmployeesPage();
     }
 
     public void onClick$persons() {
-        createPersonsPage(new HashMap<String, Object>());
+        createPersonsPage();
     }
 
     public void onClick$companies() {
-        createCompaniesPage(new HashMap<String, Object>());
+        createCompaniesPage();
     }
 
     public void onClick$services() {
-        createServicesPage(new HashMap<String, Object>());
+        createServicesPage();
     }
+
+    public void onClick$contracts() {
+        createContractsPage();
+    }
 }

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-23 15:42:22 UTC (rev 118)
+++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/Model.java	2010-07-26 14:15:05 UTC (rev 119)
@@ -87,6 +87,13 @@
     /*
      * Retrieve
      */
+    public List<EmploymentContract> retrieveAllContracts() {
+        Criteria criteria = Search.query().eq(Element.ELT_EXTENSION, EmploymentContract.EXT_EMPLOYMENTCONTRACT).criteria();
+        List<EmploymentContract> contracts = proxy.findAllByCriteria(EmploymentContract.class, criteria).getAll();
+        contracts = new ArrayList<EmploymentContract>(contracts);
+        return contracts;
+    }
+
     public Employee retrieveEmployeeById(String id) {
         if (id == null || id.isEmpty()) {
             return null;

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-23 15:42:22 UTC (rev 118)
+++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/PhonesModel.java	2010-07-26 14:15:05 UTC (rev 119)
@@ -36,36 +36,36 @@
  */
 public class PhonesModel extends AbstractListModel implements BindingListModel {
 
-    List<Phone> _phones = new ArrayList<Phone>();
+    List<Phone> phones = new ArrayList<Phone>();
 
     @Override
     public Object getElementAt(int index) {
-        return _phones.get(index);
+        return phones.get(index);
     }
 
     @Override
     public int getSize() {
-        return _phones.size();
+        return phones.size();
     }
 
     @Override
     public int indexOf(Object obj) {
-        return _phones.indexOf(obj);
+        return phones.indexOf(obj);
     }
 
-    public void setPhones(List<Phone> Phonees) {
-        _phones = Phonees;
+    public void setPhones(List<Phone> phones) {
+        this.phones = phones;
         fireEvent(ListDataEvent.CONTENTS_CHANGED, -1, -1);
     }
 
     public void addData(Phone newData) {
-        _phones.add(newData);
-        fireEvent(ListDataEvent.INTERVAL_ADDED, _phones.size() - 1, _phones.size() - 1);
+        phones.add(newData);
+        fireEvent(ListDataEvent.INTERVAL_ADDED, phones.size() - 1, phones.size() - 1);
     }
 
     public void removeData(Phone data) {
-        int interval = _phones.indexOf(data);
-        _phones.remove(data);
+        int interval = phones.indexOf(data);
+        phones.remove(data);
         fireEvent(ListDataEvent.INTERVAL_REMOVED, interval, interval);
     }
 
@@ -74,33 +74,33 @@
     }
 
     public List<Phone> getPhones() {
-        return _phones;
+        return phones;
     }
 
     public String getPhonesAsString() {
-        String phones = "";
-        for (Phone phone : _phones) {
+        String strPhones = "";
+        for (Phone phone : this.phones) {
             if (!phone.isEmpty()) {
-                phones += phone.getName() + ":" + phone.getPhone() + ";";
+                strPhones += phone.getName() + ":" + phone.getPhone() + ";";
             }
         }
-        return phones;
+        return strPhones;
     }
 
     public void setPhones(String str) {
-        _phones.clear();
-        String[] phones = StringUtil.split(str, ";");
-        for (String phone : phones) {
+        phones.clear();
+        String[] strPhones = StringUtil.split(str, ";");
+        for (String phone : strPhones) {
             String[] values = StringUtil.split(phone, ":");
             String number = "";
             if (values.length > 1) {
                 number = values[1];
             }
             Phone newPhone = new Phone(values[0], number);
-            _phones.add(newPhone);
+            phones.add(newPhone);
         }
-        if (_phones.isEmpty()) {
-            _phones.add(new Phone());
+        if (phones.isEmpty()) {
+            phones.add(new Phone());
         }
         fireEvent(ListDataEvent.CONTENTS_CHANGED, -1, -1);
     }

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-23 15:42:22 UTC (rev 118)
+++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ResultController.java	2010-07-26 14:15:05 UTC (rev 119)
@@ -23,7 +23,6 @@
  */
 package org.chorem.bonzoms.ui;
 
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
@@ -45,7 +44,6 @@
 import org.zkoss.zk.ui.event.EventListener;
 import org.zkoss.zk.ui.event.Events;
 import org.zkoss.zk.ui.util.GenericForwardComposer;
-import org.zkoss.zul.Button;
 import org.zkoss.zul.Label;
 import org.zkoss.zul.Listcell;
 import org.zkoss.zul.Listitem;

Added: trunk/bonzoms-ui-zk/src/main/webapp/contractPage.zul
===================================================================
--- trunk/bonzoms-ui-zk/src/main/webapp/contractPage.zul	                        (rev 0)
+++ trunk/bonzoms-ui-zk/src/main/webapp/contractPage.zul	2010-07-26 14:15:05 UTC (rev 119)
@@ -0,0 +1,18 @@
+<?page id="contract" title="Contract" cacheable="false" language="xul/html" zscriptLanguage="Java"?>
+<?meta content="text/html; charset=UTF-8" pageEncoding="UTF-8"?>
+<?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" root="contract"?>
+
+<window id="contract" apply="org.chorem.bonzoms.ui.ContractController">
+    Employees: <toolbarbutton id="newContract" label="Add new contract" />
+    <listbox autopaging="true" mold="paging" id="contractListBox" rows="20" model="@{contract$composer.contractsModel}"
+    itemRenderer="@{contract$composer.contractRenderer}">
+        <listhead>
+            <listheader label="Type" />
+            <listheader label="Salary" />
+            <listheader label="Working time" />
+            <listheader label="Advantages" />
+            <listheader label="Description" />
+            <listheader label="Details" />
+        </listhead>
+    </listbox>
+</window>
\ No newline at end of file

Modified: trunk/bonzoms-ui-zk/src/main/webapp/index.zul
===================================================================
--- trunk/bonzoms-ui-zk/src/main/webapp/index.zul	2010-07-23 15:42:22 UTC (rev 118)
+++ trunk/bonzoms-ui-zk/src/main/webapp/index.zul	2010-07-26 14:15:05 UTC (rev 119)
@@ -7,9 +7,10 @@
         <groupbox height="800px" >
             <caption label="Menu" />
             <vbox>
+                <toolbarbutton id="companies" label="Companies" />
+                <toolbarbutton id="contracts" label="Contracts" />
+                <toolbarbutton id="employees" label="Employees" />
                 <toolbarbutton id="persons" label="Persons" />
-                <toolbarbutton id="employees" label="Employees" />
-                <toolbarbutton id="companies" label="Companies" />
                 <toolbarbutton id="services" label="Services" />
             </vbox>
         </groupbox>

    

[Bonzoms-commits] r119 - in trunk/bonzoms-ui-zk/src/main: java/org/chorem/bonzoms/ui webapp

bbrossaud＠users.chorem.org