Skip to content

Commit 617ee59

Browse files
dolly-chhabriya-altiusdolly-chhabriya-altius
committed
Merge branch 'dev'
2 parents 19cff80 + e2bd863 commit 617ee59

8 files changed

Lines changed: 37 additions & 7 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.125[5827]</version>
13+
<version>2.126[5831]</version>
1414
<name>QAT</name>
1515
<description>Quantification Analytics Tool</description>
1616
<packaging>jar</packaging>

‎src/main/java/cc/altius/FASP/ARTMIS/dao/impl/ImportArtmisDataDaoImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public void setDataSource(DataSource dataSource) {
6969
public List<Integer> importOrderAndShipmentData(File orderFile, File shipmentFile) throws ParserConfigurationException, SAXException, IOException, FileNotFoundException {
7070
List<Integer> programList = new LinkedList<>();
7171
Date curDate = DateUtils.getCurrentDateObject(DateUtils.EST);
72-
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
72+
SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
7373
Map<String, Object> params = new HashMap<>();
7474
logger.info("################################################################################################");
7575
logger.info("Starting import of " + orderFile.getName() + " and " + shipmentFile.getName());

‎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.125[5827]
35-
info.app.frontEndVersion=[13942]
34+
info.app.version=2.126[5831]
35+
info.app.frontEndVersion=[13952]
3636
management.endpoints.web.exposure.include=*
3737
management.info.env.enabled = true
3838
management.endpoint.sessions.enabled=true

‎src/main/resources/incrementalSqlScripts/20260406-QAT-6323.sql‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
update ap_static_label l
2+
left join ap_static_label_languages ll on l.STATIC_LABEL_ID=ll.STATIC_LABEL_ID
3+
set ll.LABEL_TEXT='If checked, this displays the shipment and expiry icons. There is a shipment icon for every month with shipment(s), including all shipment statuses except cancelled, on-hold and any inactive shipments. There is an expiry icon for every month with a projected expiry.'
4+
where l.LABEL_CODE='static.report.showIconTooltip' and ll.LANGUAGE_ID=1;
5+
6+
update ap_static_label l
7+
left join ap_static_label_languages ll on l.STATIC_LABEL_ID=ll.STATIC_LABEL_ID
8+
set ll.LABEL_TEXT='Si cette option est cochée, les icônes d\'expédition et d\'expiration s\'affichent. Une icône d\'expédition est présente pour chaque mois comportant une ou plusieurs expéditions — incluant tous les statuts d\'expédition, à l\'exception des expéditions annulées, en attente ou inactives. Une icône d\'expiration est présente pour chaque mois faisant l\'objet d\'une expiration prévisionnelle.'
9+
where l.LABEL_CODE='static.report.showIconTooltip' and ll.LANGUAGE_ID=2;
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='Si se marca esta opción, se muestran los iconos de envío y de vencimiento. Se muestra un icono de envío por cada mes que contenga envíos, abarcando todos los estados de envío, a excepción de los cancelados, los puestos en espera y cualquier envío inactivo. Asimismo, se muestra un icono de vencimiento por cada mes en el que se prevea un vencimiento.'
14+
where l.LABEL_CODE='static.report.showIconTooltip' and ll.LANGUAGE_ID=3;
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='Se selecionada, esta opção apresenta os ícones de envio e validade. Existe um ícone de envio para cada mês com envios, incluindo todos os estados de envio, exceto cancelado, em espera e envios inativos. Existe um ícone de validade para cada mês com data de validade prevista.'
19+
where l.LABEL_CODE='static.report.showIconTooltip' and ll.LANGUAGE_ID=4;

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

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

‎src/main/resources/scriptsToBeRun/scriptsToBeRun.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20260330-QAT-6317.sql
1+
20260406-QAT-6323.sql

‎src/main/resources/version.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# To change this license header, choose License Headers in Project Properties.
22
# To change this template file, choose Tools | Templates
33
# and open the template in the editor.
4-
version.major=2.125
5-
version.minor=5827
4+
version.major=2.126
5+
version.minor=5831

‎src/main/resources/versionInfo.txt‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
APP Version: 2.125.5831
2+
Front End Version: 13952
3+
Date: 2026-04-07
4+
QAT-6323
5+
QAT-6320
6+
QAT-6315
7+
QAT-6311
8+
QAT-6296
9+
QAT-6290
10+
111
APP Version: 2.124.5824
212
Front End Version: 13942
313
Date: 2026-03-31

0 commit comments

Comments
 (0)