Skip to content

Commit 33cdfb4

Browse files
dolly-chhabriya-altiusdolly-chhabriya-altius
committed
Merge branch 'dev'
2 parents 11690c9 + 5f49710 commit 33cdfb4

14 files changed

Lines changed: 109 additions & 11 deletions

File tree

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
</parent>
1111
<groupId>cc.altius.FASP.rest.webservice</groupId>
1212
<artifactId>FASP</artifactId>
13-
<version>2.119[5713]</version>
13+
<version>2.120[5732]</version>
1414
<name>QAT</name>
1515
<description>Quantification Analytics Tool</description>
1616
<packaging>jar</packaging>

‎src/main/java/cc/altius/FASP/dao/impl/FundingSourceDaoImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ public List<SimpleFundingSourceObject> getFundingSourceDropdownList(CustomUserDe
210210

211211
@Override
212212
public List<SimpleFundingSourceObject> getFundingSourceForProgramsDropdownList(int[] programIds, CustomUserDetails curUser) {
213-
StringBuilder stringBuilder = new StringBuilder("SELECT fs.FUNDING_SOURCE_ID `ID`, fs.LABEL_ID, fs.LABEL_EN, fs.LABEL_FR, fs.LABEL_SP, fs.LABEL_PR, fs.FUNDING_SOURCE_CODE `CODE`, fst.`FUNDING_SOURCE_TYPE_ID` `FST_ID`, fst.`LABEL_ID` `FST_LABEL_ID`, fst.`LABEL_EN` `FST_LABEL_EN`, fst.`LABEL_FR` `FST_LABEL_FR`, fst.`LABEL_SP` `FST_LABEL_SP`, fst.`LABEL_PR` `FST_LABEL_PR`, fst.`FUNDING_SOURCE_TYPE_CODE` `FST_CODE` FROM vw_program p LEFT JOIN rm_program_funding_source pfs ON p.PROGRAM_ID=pfs.PROGRAM_ID LEFT JOIN vw_funding_source fs ON pfs.FUNDING_SOURCE_ID=fs.FUNDING_SOURCE_ID LEFT JOIN vw_funding_source_type fst ON fs.FUNDING_SOURCE_TYPE_ID=fst.FUNDING_SOURCE_TYPE_ID WHERE FIND_IN_SET(p.PROGRAM_ID, :programIds) ");
213+
StringBuilder stringBuilder = new StringBuilder("SELECT fs.FUNDING_SOURCE_ID `ID`, fs.LABEL_ID, fs.LABEL_EN, fs.LABEL_FR, fs.LABEL_SP, fs.LABEL_PR, fs.FUNDING_SOURCE_CODE `CODE`, fst.`FUNDING_SOURCE_TYPE_ID` `FST_ID`, fst.`LABEL_ID` `FST_LABEL_ID`, fst.`LABEL_EN` `FST_LABEL_EN`, fst.`LABEL_FR` `FST_LABEL_FR`, fst.`LABEL_SP` `FST_LABEL_SP`, fst.`LABEL_PR` `FST_LABEL_PR`, fst.`FUNDING_SOURCE_TYPE_CODE` `FST_CODE` FROM vw_program p LEFT JOIN rm_program_funding_source pfs ON p.PROGRAM_ID=pfs.PROGRAM_ID LEFT JOIN vw_funding_source fs ON pfs.FUNDING_SOURCE_ID=fs.FUNDING_SOURCE_ID LEFT JOIN vw_funding_source_type fst ON fs.FUNDING_SOURCE_TYPE_ID=fst.FUNDING_SOURCE_TYPE_ID WHERE fs.FUNDING_SOURCE_ID IS NOT NULL AND FIND_IN_SET(p.PROGRAM_ID, :programIds) ");
214214
Map<String, Object> params = new HashMap<>();
215215
params.put("programIds", ArrayUtils.convertArrayToString(programIds));
216216
this.aclService.addFullAclForProgram(stringBuilder, params, "p", curUser);

‎src/main/java/cc/altius/FASP/dao/impl/ProgramDataDaoImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1727,7 +1727,7 @@ public Version processSupplyPlanCommitRequest(CommitRequest spcr, CustomUserDeta
17271727
tp.put("DATA1", pr.getDt()); // Dt
17281728
tp.put("DATA2", (pr.getRegion() != null ? pr.getRegion().getId() : null)); // RegionId
17291729
tp.put("DATA3", (pr.getPlanningUnit() != null ? pr.getPlanningUnit().getId() : null)); // PlanningUnitId
1730-
tp.put("DATA4", pr.getShipmentId()); // ShipmentId
1730+
tp.put("DATA4", ((pr.getShipmentId() == null || pr.getShipmentId() == 0) && (pr.getTempShipmentId() != null && pr.getTempShipmentId() != 0) ? tempAndNewShipmentId.get(pr.getTempShipmentId()) : pr.getShipmentId())); // ShipmentId
17311731
tp.put("DATA5", pr.getData5());
17321732
// tp.put("REVIWED", pr.isReviewed());
17331733
tp.put("REVIWED", pd.getVersionType().getId() == 2 && (pr.getProblemStatus().getId() == 3 || pr.getProblemStatus().getId() == 1) ? false : pr.isReviewed());

‎src/main/java/cc/altius/FASP/model/ProblemReport.java‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ public class ProblemReport implements Serializable {
3838
@JsonView(Views.InternalView.class)
3939
private Integer shipmentId; // data4
4040
@JsonView(Views.InternalView.class)
41+
private Integer tempShipmentId;
42+
@JsonView(Views.InternalView.class)
4143
private String data5; // suggestion + description
4244
@JsonView(Views.InternalView.class)
4345
private SimpleObject problemCategory;
@@ -136,6 +138,14 @@ public void setShipmentId(Integer shipmentId) {
136138
this.shipmentId = shipmentId;
137139
}
138140

141+
public Integer getTempShipmentId() {
142+
return tempShipmentId;
143+
}
144+
145+
public void setTempShipmentId(Integer tempShipmentId) {
146+
this.tempShipmentId = tempShipmentId;
147+
}
148+
139149
public String getData5() {
140150
return data5;
141151
}
@@ -257,4 +267,4 @@ public boolean equals(Object obj) {
257267
return true;
258268
}
259269

260-
}
270+
}

‎src/main/resources/application.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ syncExpiresOn=15
3131

3232
info.app.name=QAT
3333
info.app.description=Quantification Analytics Tool
34-
info.app.version=2.119[5713]
35-
info.app.frontEndVersion=[13735]
34+
info.app.version=2.120[5732]
35+
info.app.frontEndVersion=[13747]
3636
management.endpoints.web.exposure.include=*
3737
management.info.env.enabled = true
3838
management.endpoint.sessions.enabled=true

‎src/main/resources/incrementalSqlScripts/20260209-QAT-6147.sql‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
INSERT INTO `fasp`.`ap_static_label`(`STATIC_LABEL_ID`,`LABEL_CODE`,`ACTIVE`) VALUES ( NULL,'static.mt.linkingNotificationNote1','1');
2+
SELECT MAX(l.STATIC_LABEL_ID) INTO @MAX FROM ap_static_label l ;
3+
4+
INSERT INTO ap_static_label_languages VALUES(NULL,@MAX,1,'is only available for local versions. If you don’t see the program or version you need, please'); -- en
5+
INSERT INTO ap_static_label_languages VALUES(NULL,@MAX,2,'n\'est disponible que pour les versions locales. Si vous ne trouvez pas le programme ou la version dont vous avez besoin, veuillez'); -- fr
6+
INSERT INTO ap_static_label_languages VALUES(NULL,@MAX,3,'Solo está disponible para versiones locales. Si no encuentra el programa o la versión que necesita, por favor'); -- sp
7+
INSERT INTO ap_static_label_languages VALUES(NULL,@MAX,4,'Está disponível apenas para versões locais. Se você não encontrar o programa ou a versão que precisa, por favor,'); -- pr
8+
9+
10+
INSERT INTO `fasp`.`ap_static_label`(`STATIC_LABEL_ID`,`LABEL_CODE`,`ACTIVE`) VALUES ( NULL,'static.mt.linkingNotificationNote2','1');
11+
SELECT MAX(l.STATIC_LABEL_ID) INTO @MAX FROM ap_static_label l ;
12+
13+
INSERT INTO ap_static_label_languages VALUES(NULL,@MAX,1,'your program first.'); -- en
14+
INSERT INTO ap_static_label_languages VALUES(NULL,@MAX,2,'Votre programme d\'abord.'); -- fr
15+
INSERT INTO ap_static_label_languages VALUES(NULL,@MAX,3,'Primero tu programa.'); -- sp
16+
INSERT INTO ap_static_label_languages VALUES(NULL,@MAX,4,'Seu programa primeiro.'); -- pr
17+

‎src/main/resources/incrementalSqlScripts/20260209-QAT-6195.sql‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
INSERT INTO `fasp`.`ap_static_label`(`STATIC_LABEL_ID`,`LABEL_CODE`,`ACTIVE`) VALUES ( NULL,'static.mt.reminders2D1a1A','1');
2+
SELECT MAX(l.STATIC_LABEL_ID) INTO @MAX FROM ap_static_label l ;
3+
4+
INSERT INTO ap_static_label_languages VALUES(NULL,@MAX,1,'If the ERP unit is different from your QAT planning unit, you can add an ARU with the matching ERP unit. After Master Data Syncing, the new ARU will be available in the dropdown selection when linking a new shipment.'); -- en
5+
INSERT INTO ap_static_label_languages VALUES(NULL,@MAX,2,'Si l\'unité de gestion de votre système ERP est différente de votre unité de planification QAT, vous pouvez ajouter une unité ARU correspondant à l\'unité ERP. Après la synchronisation des données de base, la nouvelle unité ARU sera disponible dans la liste déroulante lors de la création d\'une nouvelle expédition.'); -- fr
6+
INSERT INTO ap_static_label_languages VALUES(NULL,@MAX,3,'Si la unidad de ERP es diferente de la unidad de planificación de QAT, puede agregar una unidad ARU con la unidad de ERP correspondiente. Después de la sincronización de los datos maestros, la nueva unidad ARU estará disponible en el menú desplegable al vincular un nuevo envío.'); -- sp
7+
INSERT INTO ap_static_label_languages VALUES(NULL,@MAX,4,'Se a unidade do sistema ERP for diferente da sua unidade de planejamento QAT, você poderá adicionar uma ARU com a unidade do ERP correspondente. Após a sincronização dos dados mestre, a nova ARU estará disponível na lista suspensa ao vincular um novo envio.'); -- pr
8+
9+
10+
11+
update ap_static_label l
12+
left join ap_static_label_languages ll on l.STATIC_LABEL_ID=ll.STATIC_LABEL_ID
13+
set ll.LABEL_TEXT = 'Your order in the ERP system is 20 packs (10 chocolate bars per pack), but your supply plan is in packs of 100 chocolate bars. To calculate the conversion factor and add it as a new ARU, consider how many single units you have in the ERP pack size (10) and divide by how many single units you have in your QAT planning unit (100). In this example, the conversion factor is 10 bars / 100 bars = 0.1. Multiplying the ERP shipment quantity by 0.1 (or dividing by 10) results in the converted QAT shipment quantity of 2, which is the number that will be used in your supply plan.'
14+
where l.LABEL_CODE='static.mt.reminders2D3' and ll.LANGUAGE_ID=1;
15+
16+
update ap_static_label l
17+
left join ap_static_label_languages ll on l.STATIC_LABEL_ID=ll.STATIC_LABEL_ID
18+
set ll.LABEL_TEXT='Votre commande dans le système ERP est de 20 paquets (10 barres de chocolat par paquet), mais votre plan d\'approvisionnement est basé sur des paquets de 100 barres de chocolat. Pour calculer le facteur de conversion et l\'ajouter comme nouvelle unité de référence, déterminez le nombre d\'unités individuelles dans la taille de paquet ERP (10) et divisez-le par le nombre d\'unités individuelles dans votre unité de planification QAT (100). Dans cet exemple, le facteur de conversion est de 10 barres / 100 barres = 0,1. En multipliant la quantité d\'expédition ERP par 0,1 (ou en la divisant par 10), on obtient la quantité d\'expédition QAT convertie de 2, qui est le nombre qui sera utilisé dans votre plan d\'approvisionnement.'
19+
where l.LABEL_CODE='static.mt.reminders2D3' and ll.LANGUAGE_ID=2;
20+
21+
update ap_static_label l
22+
left join ap_static_label_languages ll on l.STATIC_LABEL_ID=ll.STATIC_LABEL_ID
23+
set ll.LABEL_TEXT='Su pedido en el sistema ERP es de 20 paquetes (10 tabletas de chocolate por paquete), pero su plan de suministro se basa en paquetes de 100 tabletas de chocolate. Para calcular el factor de conversión y agregarlo como una nueva unidad de referencia, considere cuántas unidades individuales hay en el tamaño del paquete del ERP (10) y divídalo entre la cantidad de unidades individuales que hay en su unidad de planificación QAT (100). En este ejemplo, el factor de conversión es 10 tabletas / 100 tabletas = 0,1. Al multiplicar la cantidad de envío del ERP por 0,1 (o dividirla entre 10), se obtiene la cantidad de envío convertida para QAT, que es 2, el número que se utilizará en su plan de suministro.'
24+
where l.LABEL_CODE='static.mt.reminders2D3' and ll.LANGUAGE_ID=3;
25+
26+
update ap_static_label l
27+
left join ap_static_label_languages ll on l.STATIC_LABEL_ID=ll.STATIC_LABEL_ID
28+
set ll.LABEL_TEXT='Seu pedido no sistema ERP é de 20 pacotes (10 barras de chocolate por pacote), mas seu plano de suprimentos utiliza pacotes de 100 barras de chocolate. Para calcular o fator de conversão e adicioná-lo como uma nova unidade de medida, considere quantas unidades individuais você tem no tamanho do pacote do ERP (10) e divida pelo número de unidades individuais na unidade de planejamento do QAT (100). Neste exemplo, o fator de conversão é 10 barras / 100 barras = 0,1. Multiplicando a quantidade de envio do ERP por 0,1 (ou dividindo por 10), obtemos a quantidade de envio convertida para o QAT, que é 2, o número que será usado em seu plano de suprimentos.'
29+
where l.LABEL_CODE='static.mt.reminders2D3' and ll.LANGUAGE_ID=4;
30+
31+
32+
update ap_static_label l
33+
left join ap_static_label_languages ll on l.STATIC_LABEL_ID=ll.STATIC_LABEL_ID
34+
set ll.LABEL_TEXT = 'Once linked, shipments will be non-editable other than the notes field and ARU field, which are editable only on the ERP linking screens.'
35+
where l.LABEL_CODE='static.mt.reminders3A' and ll.LANGUAGE_ID=1;
36+
37+
update ap_static_label l
38+
left join ap_static_label_languages ll on l.STATIC_LABEL_ID=ll.STATIC_LABEL_ID
39+
set ll.LABEL_TEXT='Une fois les expéditions liées, elles ne seront plus modifiables, à l\'exception du champ des notes et du champ ARU, qui ne sont modifiables que sur les écrans de liaison du système ERP.'
40+
where l.LABEL_CODE='static.mt.reminders3A' and ll.LANGUAGE_ID=2;
41+
42+
update ap_static_label l
43+
left join ap_static_label_languages ll on l.STATIC_LABEL_ID=ll.STATIC_LABEL_ID
44+
set ll.LABEL_TEXT='Una vez vinculados, los envíos no se podrán modificar, excepto los campos de notas y el campo ARU, que solo se pueden editar en las pantallas de vinculación del sistema ERP.'
45+
where l.LABEL_CODE='static.mt.reminders3A' and ll.LANGUAGE_ID=3;
46+
47+
update ap_static_label l
48+
left join ap_static_label_languages ll on l.STATIC_LABEL_ID=ll.STATIC_LABEL_ID
49+
set ll.LABEL_TEXT='Uma vez vinculados, os envios não poderão ser editados, exceto os campos de notas e ARU, que são editáveis ​​apenas nas telas de vinculação do sistema ERP.'
50+
where l.LABEL_CODE='static.mt.reminders3A' and ll.LANGUAGE_ID=4;

‎src/main/resources/incrementalSqlScripts/20260209-QAT-6202.sql‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
INSERT INTO `fasp`.`ap_static_label`(`STATIC_LABEL_ID`,`LABEL_CODE`,`ACTIVE`) VALUES ( NULL,'static.report.localProcurementAgentLeadTimeHeader','1');
2+
SELECT MAX(l.STATIC_LABEL_ID) INTO @MAX FROM ap_static_label l ;
3+
4+
INSERT INTO ap_static_label_languages VALUES(NULL,@MAX,1,'Local Procurement Agent Lead Time');-- en
5+
INSERT INTO ap_static_label_languages VALUES(NULL,@MAX,2,'Délai de livraison de l\'agent d\'approvisionnement local');-- fr
6+
INSERT INTO ap_static_label_languages VALUES(NULL,@MAX,3,'Plazo de entrega del agente de compras local');-- sp
7+
INSERT INTO ap_static_label_languages VALUES(NULL,@MAX,4,'Prazo de entrega do agente de compras local');-- pr

‎src/main/resources/scriptsToBeRun/QAT-6147.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
20260209-QAT-6147.sql

‎src/main/resources/scriptsToBeRun/QAT-6195.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
20260209-QAT-6195.sql

0 commit comments

Comments
 (0)