diff --git a/modules/axelor-open-suite/axelor-maintenance/src/main/resources/views/Selects.xml b/modules/axelor-open-suite/axelor-maintenance/src/main/resources/views/Selects.xml new file mode 100644 index 0000000..632beab --- /dev/null +++ b/modules/axelor-open-suite/axelor-maintenance/src/main/resources/views/Selects.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/modules/axelor-open-suite/axelor-qvm/src/main/java/com.axelor/apps.qvm/module/QvmModule.java b/modules/axelor-open-suite/axelor-qvm/src/main/java/com.axelor/apps.qvm/module/QvmModule.java index eebdf0b..b73fe0b 100644 --- a/modules/axelor-open-suite/axelor-qvm/src/main/java/com.axelor/apps.qvm/module/QvmModule.java +++ b/modules/axelor-open-suite/axelor-qvm/src/main/java/com.axelor/apps.qvm/module/QvmModule.java @@ -18,13 +18,13 @@ package com.axelor.apps.qvm.module; import com.axelor.app.AxelorModule; -import com.axelor.apps.qvm.service.OperationService; -import com.axelor.apps.qvm.service.OperationServiceImpl; +import com.axelor.apps.qvm.service.QvmOperationService; +import com.axelor.apps.qvm.service.QvmOperationServiceImpl; public class QvmModule extends AxelorModule { @Override protected void configure() { - bind(OperationService.class).to(OperationServiceImpl.class); + bind(QvmOperationService.class).to(QvmOperationServiceImpl.class); } } diff --git a/modules/axelor-open-suite/axelor-qvm/src/main/java/com.axelor/apps.qvm/service/OperationService.java b/modules/axelor-open-suite/axelor-qvm/src/main/java/com.axelor/apps.qvm/service/QvmOperationService.java similarity index 70% rename from modules/axelor-open-suite/axelor-qvm/src/main/java/com.axelor/apps.qvm/service/OperationService.java rename to modules/axelor-open-suite/axelor-qvm/src/main/java/com.axelor/apps.qvm/service/QvmOperationService.java index e3e8525..f8aac38 100644 --- a/modules/axelor-open-suite/axelor-qvm/src/main/java/com.axelor/apps.qvm/service/OperationService.java +++ b/modules/axelor-open-suite/axelor-qvm/src/main/java/com.axelor/apps.qvm/service/QvmOperationService.java @@ -18,21 +18,21 @@ package com.axelor.apps.qvm.service; import com.axelor.apps.base.db.Company; -import com.axelor.apps.qvm.db.Operation; +import com.axelor.apps.qvm.db.QvmOperation; import com.axelor.exception.AxelorException; import com.google.inject.persist.Transactional; -public interface OperationService { +public interface QvmOperationService { @Transactional - public Operation createCalibrationSeq(Company company) throws AxelorException; + public QvmOperation createCalibrationSeq(Company company) throws AxelorException; @Transactional - public Operation createQualificationSeq(Company company) throws AxelorException; + public QvmOperation createQualificationSeq(Company company) throws AxelorException; @Transactional - public Operation createOperationSeq(Company company) throws AxelorException; + public QvmOperation createOperationSeq(Company company) throws AxelorException; @Transactional - public Operation setMachine(Operation operation) throws AxelorException; + public QvmOperation setMachine(QvmOperation operation) throws AxelorException; } diff --git a/modules/axelor-open-suite/axelor-qvm/src/main/java/com.axelor/apps.qvm/service/OperationServiceImpl.java b/modules/axelor-open-suite/axelor-qvm/src/main/java/com.axelor/apps.qvm/service/QvmOperationServiceImpl.java similarity index 84% rename from modules/axelor-open-suite/axelor-qvm/src/main/java/com.axelor/apps.qvm/service/OperationServiceImpl.java rename to modules/axelor-open-suite/axelor-qvm/src/main/java/com.axelor/apps.qvm/service/QvmOperationServiceImpl.java index 0541d6f..8548ed2 100644 --- a/modules/axelor-open-suite/axelor-qvm/src/main/java/com.axelor/apps.qvm/service/OperationServiceImpl.java +++ b/modules/axelor-open-suite/axelor-qvm/src/main/java/com.axelor/apps.qvm/service/QvmOperationServiceImpl.java @@ -20,40 +20,40 @@ package com.axelor.apps.qvm.service; import com.axelor.apps.base.db.Company; import com.axelor.apps.base.db.repo.SequenceRepository; import com.axelor.apps.base.service.administration.SequenceService; -import com.axelor.apps.qvm.db.Operation; +import com.axelor.apps.qvm.db.QvmOperation; import com.axelor.exception.AxelorException; import com.axelor.exception.db.repo.TraceBackRepository; import com.axelor.i18n.I18n; import com.google.inject.Inject; import com.google.inject.persist.Transactional; -public class OperationServiceImpl implements OperationService { +public class QvmOperationServiceImpl implements QvmOperationService { @Inject protected SequenceService sequenceService; @Transactional - public Operation createCalibrationSeq(Company company) throws AxelorException { + public QvmOperation createCalibrationSeq(Company company) throws AxelorException { - Operation calibration = new Operation(); + QvmOperation calibration = new QvmOperation(); calibration.setSerialNumber(this.getCalibrationSequence(company)); return calibration; } @Transactional - public Operation createQualificationSeq(Company company) throws AxelorException { + public QvmOperation createQualificationSeq(Company company) throws AxelorException { - Operation qualification = new Operation(); + QvmOperation qualification = new QvmOperation(); qualification.setSerialNumber(this.getQualificationSequence(company)); return qualification; } @Transactional - public Operation createOperationSeq(Company company) throws AxelorException { + public QvmOperation createOperationSeq(Company company) throws AxelorException { - Operation operation = new Operation(); + QvmOperation operation = new QvmOperation(); operation.setSerialNumber(this.getOperationSequence(company)); return operation; @@ -98,7 +98,7 @@ public class OperationServiceImpl implements OperationService { return seq; } - public Operation setMachine(Operation calibration) throws AxelorException { + public QvmOperation setMachine(QvmOperation calibration) throws AxelorException { if (calibration.getMachineName() != null) { System.out.println("calibration.getMachineName : " + calibration.getMachineName()); } diff --git a/modules/axelor-open-suite/axelor-qvm/src/main/java/com.axelor/apps.qvm/web/QvmOperationController.java b/modules/axelor-open-suite/axelor-qvm/src/main/java/com.axelor/apps.qvm/web/QvmOperationController.java index dd75f2c..33dcf85 100644 --- a/modules/axelor-open-suite/axelor-qvm/src/main/java/com.axelor/apps.qvm/web/QvmOperationController.java +++ b/modules/axelor-open-suite/axelor-qvm/src/main/java/com.axelor/apps.qvm/web/QvmOperationController.java @@ -17,9 +17,9 @@ */ package com.axelor.apps.qvm.web; -import com.axelor.apps.qvm.db.Operation; -import com.axelor.apps.qvm.service.OperationService; -import com.axelor.apps.qvm.service.OperationServiceImpl; +import com.axelor.apps.qvm.db.QvmOperation; +import com.axelor.apps.qvm.service.QvmOperationService; +import com.axelor.apps.qvm.service.QvmOperationServiceImpl; import com.axelor.exception.AxelorException; import com.axelor.exception.service.TraceBackService; import com.axelor.inject.Beans; @@ -36,12 +36,12 @@ public class QvmOperationController { public void setSequenceOperation(ActionRequest request, ActionResponse response) { try { - Operation calibration = request.getContext().asType(Operation.class); + QvmOperation calibration = request.getContext().asType(QvmOperation.class); if (calibration != null && calibration.getCompany() != null) { response.setValue( "serialNumber", - Beans.get(OperationService.class) + Beans.get(QvmOperationService.class) .createOperationSeq(calibration.getCompany()) .getSerialNumber()); } else { @@ -56,12 +56,12 @@ public class QvmOperationController { public void setSequenceCalibration(ActionRequest request, ActionResponse response) { try { - Operation calibration = request.getContext().asType(Operation.class); + QvmOperation calibration = request.getContext().asType(QvmOperation.class); if (calibration != null && calibration.getCompany() != null) { response.setValue( "serialNumber", - Beans.get(OperationService.class) + Beans.get(QvmOperationService.class) .createCalibrationSeq(calibration.getCompany()) .getSerialNumber()); } else { @@ -76,12 +76,12 @@ public class QvmOperationController { public void setSequenceQualification(ActionRequest request, ActionResponse response) { try { - Operation calibration = request.getContext().asType(Operation.class); + QvmOperation calibration = request.getContext().asType(QvmOperation.class); if (calibration != null && calibration.getCompany() != null) { response.setValue( "serialNumber", - Beans.get(OperationService.class) + Beans.get(QvmOperationService.class) .createQualificationSeq(calibration.getCompany()) .getSerialNumber()); } else { @@ -96,8 +96,7 @@ public class QvmOperationController { public void setMachineInfo(ActionRequest request, ActionResponse response) throws AxelorException { - Operation calibration = request.getContext().asType(Operation.class); - Operation newOperation = Beans.get(OperationService.class).setMachine(calibration); - // response.setValue(calibration,newOperation); + QvmOperation calibration = request.getContext().asType(QvmOperation.class); + QvmOperation newOperation = Beans.get(QvmOperationService.class).setMachine(calibration); } } diff --git a/modules/axelor-open-suite/axelor-qvm/src/main/resources/domains/Machine.xml b/modules/axelor-open-suite/axelor-qvm/src/main/resources/domains/Machine.xml index cc9e203..30bffa6 100644 --- a/modules/axelor-open-suite/axelor-qvm/src/main/resources/domains/Machine.xml +++ b/modules/axelor-open-suite/axelor-qvm/src/main/resources/domains/Machine.xml @@ -6,8 +6,8 @@ - - + + diff --git a/modules/axelor-open-suite/axelor-qvm/src/main/resources/domains/MachineLocation.xml b/modules/axelor-open-suite/axelor-qvm/src/main/resources/domains/QvmMachineLocation.xml similarity index 85% rename from modules/axelor-open-suite/axelor-qvm/src/main/resources/domains/MachineLocation.xml rename to modules/axelor-open-suite/axelor-qvm/src/main/resources/domains/QvmMachineLocation.xml index 4f59f03..d5656c1 100644 --- a/modules/axelor-open-suite/axelor-qvm/src/main/resources/domains/MachineLocation.xml +++ b/modules/axelor-open-suite/axelor-qvm/src/main/resources/domains/QvmMachineLocation.xml @@ -5,9 +5,9 @@ - + - + diff --git a/modules/axelor-open-suite/axelor-qvm/src/main/resources/domains/Operation.xml b/modules/axelor-open-suite/axelor-qvm/src/main/resources/domains/QvmOperation.xml similarity index 91% rename from modules/axelor-open-suite/axelor-qvm/src/main/resources/domains/Operation.xml rename to modules/axelor-open-suite/axelor-qvm/src/main/resources/domains/QvmOperation.xml index 91d2433..22ab80a 100644 --- a/modules/axelor-open-suite/axelor-qvm/src/main/resources/domains/Operation.xml +++ b/modules/axelor-open-suite/axelor-qvm/src/main/resources/domains/QvmOperation.xml @@ -5,25 +5,25 @@ - + - + - - + + - + diff --git a/modules/axelor-open-suite/axelor-qvm/src/main/resources/domains/OperationType.xml b/modules/axelor-open-suite/axelor-qvm/src/main/resources/domains/QvmOperationType.xml similarity index 83% rename from modules/axelor-open-suite/axelor-qvm/src/main/resources/domains/OperationType.xml rename to modules/axelor-open-suite/axelor-qvm/src/main/resources/domains/QvmOperationType.xml index dbfd153..4512604 100644 --- a/modules/axelor-open-suite/axelor-qvm/src/main/resources/domains/OperationType.xml +++ b/modules/axelor-open-suite/axelor-qvm/src/main/resources/domains/QvmOperationType.xml @@ -5,18 +5,18 @@ - + - + - + diff --git a/modules/axelor-open-suite/axelor-qvm/src/main/resources/views/MachineLocation.xml b/modules/axelor-open-suite/axelor-qvm/src/main/resources/views/QvmMachineLocation.xml similarity index 82% rename from modules/axelor-open-suite/axelor-qvm/src/main/resources/views/MachineLocation.xml rename to modules/axelor-open-suite/axelor-qvm/src/main/resources/views/QvmMachineLocation.xml index f2c4a04..231afa1 100644 --- a/modules/axelor-open-suite/axelor-qvm/src/main/resources/views/MachineLocation.xml +++ b/modules/axelor-open-suite/axelor-qvm/src/main/resources/views/QvmMachineLocation.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://axelor.com/xml/ns/object-views http://axelor.com/xml/ns/object-views/object-views_5.2.xsd"> - + -
+ @@ -18,7 +18,7 @@
- +