RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bug 1633 fixed

Browse source
This commit is contained in:
Vova Perebykivskiy 2015-09-08 10:28:00 +03:00 • committed by Jeroen Baten
parent 17ef953a86
commit 7531b75ac0
4 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.gitignore vendored
View file

@ -10,6 +10,10 @@ ganttzk/target
.project
.settings/
# ignore IDEA configuration files
.idea
*.iml
#ignore patches files
*.patch

1
libreplan-business/src/main/java/org/libreplan/business/common/IntegrationEntity.java
View file

@ -105,6 +105,7 @@ public abstract class IntegrationEntity extends BaseEntity {
* with the same code. This method is a Template method that calls on
* the private method <code>findIntegrationEntityDAO</code>, which in turn
* calls on the abstract method <code>getIntegrationEntityDAO()</code>.
* Code of entity looks like: "WORK_REPORT_0001"
*/
@AssertTrue(message="code is already used")
public boolean isUniqueCodeConstraint() {

5
libreplan-business/src/main/java/org/libreplan/business/common/daos/EntitySequenceDAO.java
View file

@ -110,16 +110,13 @@ public class EntitySequenceDAO extends
for (int i = 0; i < 5; i++) {
try {
String code;
Integer cont = 0;
EntitySequence entitySequence = getActiveEntitySequence(entityName);
do {
entitySequence.incrementLastValue();
code = entitySequence.getCode();
cont++;
} while (entityName.getIntegrationEntityDAO()
.existsByCode(code)
&& cont < 100);
.existsByCode(code));
save(entitySequence);
return code;

18
libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReport.java
View file

@ -440,19 +440,23 @@ public class WorkReport extends IntegrationEntity implements
public void generateWorkReportLineCodes(int numberOfDigits) {
for (WorkReportLine line : this.getWorkReportLines()) {
if ((line.getCode() == null) || (line.getCode().isEmpty())
|| (!line.getCode().startsWith(this.getCode()))) {
if ((line.getCode() == null) || (line.getCode().isEmpty()) ||
(!line.getCode().startsWith(this.getCode()))) {
this.incrementLastWorkReportLineSequenceCode();
String lineCode = EntitySequence.formatValue(numberOfDigits,
this.getLastWorkReportLineSequenceCode());
line.setCode(this.getCode()
+ EntitySequence.CODE_SEPARATOR_CHILDREN + lineCode);
String lineCode = EntitySequence.formatValue(
numberOfDigits, this.getLastWorkReportLineSequenceCode());
line.setCode(this.getCode() +
EntitySequence.CODE_SEPARATOR_CHILDREN + lineCode);
}
}
}
public void incrementLastWorkReportLineSequenceCode() {
if(lastWorkReportLineSequenceCode==null){
if(lastWorkReportLineSequenceCode == null){
lastWorkReportLineSequenceCode = 0;
}
lastWorkReportLineSequenceCode++;