i18n.

Add Limits functionality.
Changes to INSTALL and HACKING documents.

(cherry picked from commit 0a0af1e9cded313ac4d5293d16cf834346287ccb)

HACKING.rst

@@ -228,8 +228,6 @@ Microsoft Windows
     # Copy downloaded *.jar file to JAVA_HOME location: (e.g. C:\Program Files\Java\jdk1.7.0_80\jre\lib\ext)
     # Put downloaded *.jar file to Tomcat lib location: (e.g. C:\Program Files\Apache Software Foundation\Tomcat 6.0\lib)
 
-* Download latest ``.war`` file from SourceForge.net (for PostgreSQL) and rename it to libreplan.war::
-
    # http://sourceforge.net/projects/libreplan/files/LibrePlan/
 
 * Create database::
@@ -266,15 +264,12 @@ Microsoft Windows
 
     GRANT ALL PRIVILEGES ON DATABASE libreplan TO libreplan;
 
-* Restore PostgreSQL dump - scripts/database/postgresql_1.4.1.backup::
-
 * Create an Environment Variable JAVA_HOME
 
     # You need to set it to your JDK installed directory
 
 * Configure Apache Tomcat Server
 
-    # Put your libreplan.war file to Apache Tomcat webapps folder (e.g. C:\Program Files\Apache Software Foundation\Tomcat 6.0\webapps\)
     # Go to (e.g. C:\Program Files\Apache Software Foundation\Tomcat 6.0\conf\Catalina\localhost\) and create there libreplan.xml file with this lines of code:
 
     <?xml version="1.0" encoding="UTF-8"?>
@@ -288,13 +283,7 @@ Microsoft Windows
             url="jdbc:postgresql://localhost/libreplan" />
     </Context>
 
-* Start Apache Tomcat server
-
-    # Possible location: C:\Program Files\Apache Software Foundation\Tomcat 6.0\bin\Tomcat6.exe
-
-* Go to http://localhost:8080/libreplan
 =======
-* Restore PostgreSQL dump - scripts/database/postgresql_1.4.1.backup
 
 * Download source code::
 
@@ -316,8 +305,12 @@ Microsoft Windows
 
 * Launch application::
 
-    # cd libreplan-webapp
+    * Get *.war file from project folder (e.g ../libreplan/libreplan-webapp/target/libreplan-webapp.war)
-    # mvn jetty:run
+    * Rename it to libreplan.war
+    * Put your libreplan.war file to Apache Tomcat webapps folder (e.g. C:\Program Files\Apache Software Foundation\Tomcat 6.0\webapps\)
+    * Start Apache Tomcat server
+
+    # Possible location: C:\Program Files\Apache Software Foundation\Tomcat 6.0\bin\Tomcat6.exe
 
 * Go to http://localhost:8080/libreplan-webapp/
 

INSTALL.rst

@@ -326,7 +326,7 @@ Microsoft Windows
 
 Instructions:
 
-* Download and install latest Java Runtime Environment 7u79 (JRE7u79)::
+* Download and install latest Java Runtime Environment 7u80 (JRE7u79)::
 
     # http://www.oracle.com/technetwork/java/javase/downloads/jre7-downloads-1880261.html
 
@@ -367,7 +367,7 @@ Instructions:
     ON ALL TABLES IN SCHEMA public
     TO libreplan;
 
-* Restore PostgreSQL dump - scripts/database/postgresql_1.4.1.backup::
+* Restore PostgreSQL / MySQL dump::
 
 * Create an Environment Variable JRE_HOME
 

libreplan-business/src/main/java/org/libreplan/business/common/daos/ILimitsDAO.java

@@ -35,6 +35,5 @@ public interface ILimitsDAO extends IGenericDAO<Limits, Long> {
     List<Limits> getAll();
 
     Limits getUsersType();
-    Limits getWorkersType();
+    Limits getResourcesType();
-    Limits getMachinesType();
 }

libreplan-business/src/main/java/org/libreplan/business/common/daos/LimitsDAO.java

@@ -49,19 +49,10 @@ public class LimitsDAO extends GenericDAOHibernate<Limits, Long> implements ILim
     }
 
     @Override
-    public Limits getWorkersType() {
+    public Limits getResourcesType() {
         List<Limits> list = list(Limits.class);
         for (Limits item : list)
-            if (item.getType().equals("workers")) return item;
+            if (item.getType().equals("workers+machines")) return item;
         return null;
     }
-
-    @Override
-    public Limits getMachinesType() {
-        List<Limits> list = list(Limits.class);
-        for (Limits item : list)
-            if (item.getType().equals("machines")) return item;
-        return null;
-    }
-
 }

libreplan-business/src/main/java/org/libreplan/business/common/entities/Limits.java

@@ -34,7 +34,7 @@ public class Limits extends BaseEntity{
 
     private String type;
 
-    private Long value;
+    private Integer value;
 
 
     public String getType() {
@@ -44,10 +44,10 @@ public class Limits extends BaseEntity{
         this.type = type;
     }
 
-    public Long getValue() {
+    public Integer getValue() {
         return value;
     }
-    public void setValue(Long value) {
+    public void setValue(Integer value) {
         this.value = value;
     }
 }

libreplan-business/src/main/java/org/libreplan/business/resources/daos/IMachineDAO.java

@@ -33,7 +33,6 @@ import org.libreplan.business.resources.entities.Machine;
  * @author Diego Pino Garcia <dpino@igalia.com>
  * @author Javier Moran Rua <jmoran@igalia.com>
  * @author Fernando Bellas Permuy <fbellas@udc.es>
- * @author Vova Perebykivskiy <vova@libreplan-enterprise.com>
  */
 public interface IMachineDAO extends IIntegrationEntityDAO<Machine> {
 
@@ -83,9 +82,4 @@ public interface IMachineDAO extends IIntegrationEntityDAO<Machine> {
      * code as the one passed as parameter
      */
     boolean existsMachineWithCodeInAnotherTransaction(String code);
-
-    /**
-     * Return a number of rows in database table
-     */
-    Number getRowCount();
 }

libreplan-business/src/main/java/org/libreplan/business/resources/daos/IResourceDAO.java

@@ -120,4 +120,6 @@ public interface IResourceDAO extends IIntegrationEntityDAO<Resource> {
      */
     List<HoursWorkedPerWorkerInAMonthDTO> getWorkingHoursPerWorker(Integer year, Integer month);
 
+    Number getRowCount();
+
 }

libreplan-business/src/main/java/org/libreplan/business/resources/daos/IWorkerDAO.java

@@ -36,7 +36,6 @@ import org.springframework.transaction.annotation.Transactional;
  * @author Fernando Bellas Permuy <fbellas@udc.es>
  * @author Manuel Rego Casasnovas <mrego@igalia.com>
  * @author Diego Pino Garcia <dpino@igalia.com>
- * @author Vova Perebykivskiy <vova@libreplan-enterprise.com>
  */
 public interface IWorkerDAO extends IIntegrationEntityDAO<Worker> {
 
@@ -127,6 +126,4 @@ public interface IWorkerDAO extends IIntegrationEntityDAO<Worker> {
      * Return the list of {@link Worker Workers} bound to any {@link User}.
      */
     List<Worker> getBound();
-
-    Number getRowCount();
 }

libreplan-business/src/main/java/org/libreplan/business/resources/daos/MachineDAO.java

@@ -41,7 +41,6 @@ import org.springframework.transaction.annotation.Transactional;
  * @author Diego Pino Garcia <dpino@igalia.com>
  * @author Javier Moran Rua <jmoran@igalia.com>
  * @author Fernando Bellas Permuy <fbellas@udc.es>
- * @author Vova Perebykivskiy <vova@libreplan-enterprise.com>
  */
 @Repository
 @Scope(BeanDefinition.SCOPE_SINGLETON)
@@ -84,11 +83,6 @@ public class MachineDAO extends IntegrationEntityDAO<Machine>
         }
     }
 
-    @Override
-    public Number getRowCount() {
-        return (Number) getSession().createCriteria(Machine.class).setProjection(Projections.rowCount()).uniqueResult();
-    }
-
     @Override
     @Transactional(readOnly= true, propagation = Propagation.REQUIRES_NEW)
     public Machine findUniqueByCodeInAnotherTransaction(String code)

libreplan-business/src/main/java/org/libreplan/business/resources/daos/ResourceDAO.java

@@ -27,6 +27,7 @@ import java.util.Iterator;
 import java.util.List;
 
 import org.hibernate.Query;
+import org.hibernate.criterion.Projections;
 import org.hibernate.criterion.Restrictions;
 import org.libreplan.business.common.daos.IntegrationEntityDAO;
 import org.libreplan.business.labels.entities.Label;
@@ -248,6 +249,11 @@ public class ResourceDAO extends IntegrationEntityDAO<Resource> implements
         return result;
     }
 
+    @Override
+    public Number getRowCount() {
+        return (Number) getSession().createCriteria(Resource.class).setProjection(Projections.rowCount()).uniqueResult();
+    }
+
     private List<HoursWorkedPerWorkerInAMonthDTO> toDTO(List<Object> rows) {
         List<HoursWorkedPerWorkerInAMonthDTO> result = new ArrayList<HoursWorkedPerWorkerInAMonthDTO>();
 

libreplan-business/src/main/java/org/libreplan/business/resources/daos/WorkerDAO.java

@@ -44,7 +44,6 @@ import org.springframework.transaction.annotation.Transactional;
  * @author Fernando Bellas Permuy <fbellas@udc.es>
  * @author Manuel Rego Casasnovas <mrego@igalia.com>
  * @author Diego Pino Garcia <dpino@igalia.com>
- * @author Vova Perebykivskiy <vova@libreplan-enterprise.com>
  */
 @Repository
 @Scope(BeanDefinition.SCOPE_SINGLETON)
@@ -199,10 +198,4 @@ public class WorkerDAO extends IntegrationEntityDAO<Worker>
         criteria.add(Restrictions.isNotNull("user"));
         return criteria.list();
     }
-
-    @Override
-    public Number getRowCount() {
-        return (Number) getSession().createCriteria(Worker.class).setProjection(Projections.rowCount()).uniqueResult();
-    }
-
 }

libreplan-business/src/main/resources/db.changelog-1.4.xml

@@ -45,4 +45,28 @@
                                  referencedTableName="type_of_work_hours" referencedColumnNames="id" />
     </changeSet>
 
+    <changeSet id="adding-limits" author="vova/jeroen">
+        <createTable tableName="limits">
+            <column name="id" type="BIGINT" autoIncrement="true">
+                <constraints primaryKey="true" nullable="false" primaryKeyName="limits_pkey"/>
+            </column>
+
+            <column name="type" type="varchar(20)"/>
+
+            <column name="value" type="INTEGER"/>
+
+        </createTable>
+        <addUniqueConstraint
+                constraintName="type"
+                columnNames="type"
+                deferrable="false"
+                disabled="false"
+                initiallyDeferred="false"
+                tableName="limits"/>
+        <sql>
+            INSERT INTO limits VALUES(0, 'users', 5);
+            INSERT INTO limits VALUES(1, 'workers+machines', 10);
+        </sql>
+    </changeSet>
+
 </databaseChangeLog>

libreplan-webapp/src/main/java/org/libreplan/web/common/ILimitsModel.java

@@ -34,6 +34,5 @@ public interface ILimitsModel {
     List<Limits> getAll();
 
     Limits getUsersType();
-    Limits getWorkersType();
+    Limits getResourcesType();
-    Limits getMachinesType();
 }

libreplan-webapp/src/main/java/org/libreplan/web/common/LimitsModel.java

@@ -58,13 +58,7 @@ public class LimitsModel implements ILimitsModel {
 
     @Override
     @Transactional(readOnly = true)
-    public Limits getWorkersType() {
+    public Limits getResourcesType() {
-        return limitsDAO.getWorkersType();
+        return limitsDAO.getResourcesType();
-    }
-
-    @Override
-    @Transactional(readOnly = true)
-    public Limits getMachinesType() {
-        return limitsDAO.getMachinesType();
     }
 }

libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/IMachineModel.java

@@ -63,7 +63,6 @@ import org.libreplan.web.resources.search.ResourcePredicate;
  *
  * @author Diego Pino Garcia <dpino@igalia.com>
  * @author Javier Moran Rua <jmoran@igalia.com>
- * @author Vova Perebykivskiy <vova@libreplan-enterprise.com>
  */
 public interface IMachineModel extends IIntegrationEntityModel {
     // Initial conversational steps
@@ -108,7 +107,4 @@ public interface IMachineModel extends IIntegrationEntityModel {
     void confirmRemove(Machine machine) throws InstanceNotFoundException;
 
     void removeCalendar();
-
-    Number getRowCount();
-
 }

libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java

@@ -34,6 +34,7 @@ import org.libreplan.business.calendars.entities.ResourceCalendar;
 import org.libreplan.business.common.entities.Limits;
 import org.libreplan.business.common.exceptions.InstanceNotFoundException;
 import org.libreplan.business.common.exceptions.ValidationException;
+import org.libreplan.business.resources.daos.IResourceDAO;
 import org.libreplan.business.resources.entities.Machine;
 import org.libreplan.web.calendars.BaseCalendarEditionController;
 import org.libreplan.web.calendars.IBaseCalendarModel;
@@ -48,6 +49,7 @@ import org.libreplan.web.costcategories.ResourcesCostCategoryAssignmentControlle
 import org.libreplan.web.resources.search.ResourcePredicate;
 import org.libreplan.web.resources.worker.CriterionsController;
 import org.libreplan.web.resources.worker.CriterionsMachineController;
+import org.libreplan.web.resources.worker.IWorkerModel;
 import org.libreplan.web.resources.worker.WorkerCRUDController.LimitingResourceEnum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.zkoss.zk.ui.Component;
@@ -88,6 +90,9 @@ public class MachineCRUDController extends BaseCRUDController<Machine> {
     @Autowired
     private IMachineModel machineModel;
 
+    @Autowired
+    private IResourceDAO resourceDAO;
+
     private Component configurationUnits;
 
     private CriterionsMachineController criterionsController;
@@ -620,23 +625,26 @@ public class MachineCRUDController extends BaseCRUDController<Machine> {
     }
 
     public boolean isCreateButtonDisabled(){
-        Limits machinesTypeLimit = limitsModel.getMachinesType();
+        Limits resourcesTypeLimit = limitsModel.getResourcesType();
-        Long machinesCount = (Long) machineModel.getRowCount();
+        Integer resourcesCount = (Integer) resourceDAO.getRowCount();
-        if ( machinesTypeLimit != null )
+
-            if ( machinesCount >= machinesTypeLimit.getValue() )
+        if ( resourcesTypeLimit != null )
+            if ( resourcesCount >= resourcesTypeLimit.getValue() )
                 return true;
 
         return false;
     }
 
     public String getShowCreateFormLabel(){
-        Limits machinesTypeLimit = limitsModel.getMachinesType();
+        Limits resourcesTypeLimit = limitsModel.getResourcesType();
-        Long machinesCount = (Long) machineModel.getRowCount();
+        Integer resourcesCount = (Integer) resourceDAO.getRowCount();
-        if ( machinesTypeLimit != null )
+
-            if ( machinesCount >= machinesTypeLimit.getValue() )
+        int resourcesLeft = resourcesTypeLimit.getValue() - resourcesCount;
+        if ( resourcesTypeLimit != null )
+            if ( resourcesCount >= resourcesTypeLimit.getValue() )
                 return _("Machines limit reached");
 
-        return _("Create");
+        return _("Create") + " ( " + resourcesLeft  + " " + _("left") + " )";
     }
 
 }

libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineModel.java

@@ -70,7 +70,6 @@ import org.springframework.transaction.annotation.Transactional;
 /**
  * @author Diego Pino Garcia <dpino@igalia.com>
  * @author Javier Moran Rua <jmoran@igalia.com>
- * @author Vova Perebykivskiy <vova@libreplan-enterprise.com>
  */
 @Service
 @Scope(BeanDefinition.SCOPE_PROTOTYPE)
@@ -403,12 +402,4 @@ public class MachineModel extends IntegrationEntityModel implements
         calendarToRemove = machine.getCalendar();
         machine.setCalendar(null);
     }
-
-    @Override
-    @Transactional(readOnly = true)
-    public Number getRowCount() {
-        return machineDAO.getRowCount();
-    }
-
-
 }

libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/IWorkerModel.java

@@ -74,7 +74,6 @@ import org.libreplan.web.resources.search.ResourcePredicate;
  * @author Óscar González Fernández <ogonzalez@igalia.com>
  * @author Fernando Bellas Permuy <fbellas@udc.es>
  * @author Manuel Rego Casasnovas <rego@igalia.com>
- * @author Vova Perebykivskiy <vova@libreplan-enterprise.com>
  */
 public interface IWorkerModel extends IIntegrationEntityModel {
 
@@ -147,7 +146,4 @@ public interface IWorkerModel extends IIntegrationEntityModel {
     void setBoundUser(User user);
 
     User getBoundUserFromDB(Worker worker);
-
-    Number getRowCount();
-
 }

libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java

@@ -38,6 +38,7 @@ import org.libreplan.business.calendars.entities.ResourceCalendar;
 import org.libreplan.business.common.entities.Limits;
 import org.libreplan.business.common.exceptions.InstanceNotFoundException;
 import org.libreplan.business.common.exceptions.ValidationException;
+import org.libreplan.business.resources.daos.IResourceDAO;
 import org.libreplan.business.resources.entities.ResourceType;
 import org.libreplan.business.resources.entities.VirtualWorker;
 import org.libreplan.business.resources.entities.Worker;
@@ -114,6 +115,9 @@ public class WorkerCRUDController extends GenericForwardComposer implements
     @Autowired
     private IWorkerModel workerModel;
 
+    @Autowired
+    private IResourceDAO resourceDAO;
+
     @Resource
     private IUserCRUDController userCRUD;
 
@@ -1167,23 +1171,26 @@ public class WorkerCRUDController extends GenericForwardComposer implements
     }
 
     public boolean isCreateButtonDisabled(){
-        Limits workersTypeLimit = limitsModel.getWorkersType();
+        Limits resourcesTypeLimit = limitsModel.getResourcesType();
-        Long workersCount = (Long) workerModel.getRowCount();
+        Integer resourcesCount = (Integer) resourceDAO.getRowCount();
-        if ( workersTypeLimit != null )
+
-            if ( workersCount >= workersTypeLimit.getValue() )
+        if ( resourcesTypeLimit != null )
+            if ( resourcesCount >= resourcesTypeLimit.getValue() )
                 return true;
 
         return false;
     }
 
     public String getShowCreateFormLabel(){
-        Limits workersTypeLimit = limitsModel.getWorkersType();
+        Limits resourcesTypeLimit = limitsModel.getResourcesType();
-        Long workersCount = (Long) workerModel.getRowCount();
+        Integer resourcesCount = (Integer) resourceDAO.getRowCount();
-        if ( workersTypeLimit != null )
+
-            if ( workersCount >= workersTypeLimit.getValue() )
+        int resourcesLeft = resourcesTypeLimit.getValue() - resourcesCount;
+        if ( resourcesTypeLimit != null )
+            if ( resourcesCount >= resourcesTypeLimit.getValue() )
                 return _("Workers limit reached");
 
-        return _("Create");
+        return _("Create") + " ( " + resourcesLeft  + " " + _("left") + " )";
     }
 
 }

libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerModel.java

@@ -702,11 +702,4 @@ public class WorkerModel extends IntegrationEntityModel implements IWorkerModel
         }
         return null;
     }
-
-    @Override
-    @Transactional(readOnly = true)
-    public Number getRowCount() {
-        return workerDAO.getRowCount();
-    }
-
 }

libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java

@@ -505,7 +505,7 @@ public class UserCRUDController extends BaseCRUDController<User> implements
 
     public boolean isCreateButtonDisabled(){
         Limits usersTypeLimit = limitsModel.getUsersType();
-        Long usersCount = (Long) userModel.getRowCount();
+        Integer usersCount = (Integer) userModel.getRowCount();
         if (usersTypeLimit != null)
             if ( usersCount >= usersTypeLimit.getValue() )
                 return true;
@@ -514,11 +514,12 @@ public class UserCRUDController extends BaseCRUDController<User> implements
 
     public String getShowCreateFormLabel(){
         Limits usersTypeLimit = limitsModel.getUsersType();
-        Long usersCount = (Long) userModel.getRowCount();
+        Integer usersCount = (Integer) userModel.getRowCount();
+        int usersLeft = usersTypeLimit.getValue() - usersCount;
         if (usersTypeLimit != null)
             if ( usersCount >= usersTypeLimit.getValue() )
                 return _("User limit reached");
 
-        return _("Create");
+        return _("Create") + " ( " + usersLeft  + " " + _("left") + " )";
     }
 }

libreplan-webapp/src/main/resources/i18n/keys.pot

@@ -8631,6 +8631,9 @@ msgstr ""
 #: libreplan-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:33
 #: libreplan-webapp/src/main/webapp/unittypes/_listUnitTypes.zul:32
 #: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:58
+#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:523
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:640
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:1187
 msgid "Create"
 msgstr ""
 
@@ -9292,7 +9295,13 @@ msgstr ""
 msgid "User limit reached"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/UserCRUDController.java:1178
+#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:523
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:640
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:1187
+msgid "left"
+msgstr ""
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:1178
 msgid "Workers limit reached"
 msgstr ""