Skip to content

Commit b3f14e0

Browse files
DevSegDevSeg
committed
- Updating Dry Run Functionality in Region and District (Expanding #454)
1 parent a4706e4 commit b3f14e0

File tree

7 files changed

+67
-8
lines changed

7 files changed

+67
-8
lines changed

‎apmis-flow/src/main/java/com/cinoteck/application/views/configurations/ClusterDataImporter.java‎

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ public ClusterDataImporter(File inputFile, boolean hasEntityClassRow, CommunityD
106106
public ValueSeparator getCsvSeparator() {
107107
return csvSeparator;
108108
}
109+
109110

110111
public List<String> extractColumnValues(String columnName) throws IOException {
111112
Set<String> columnValues = new HashSet<>();
@@ -459,9 +460,20 @@ public Exception apply(ImportCellData cellData) {
459460
.getByExternalId(externalId, false);
460461
DistrictReferenceDto districtReferenceDto = areasz.get(0);
461462
newUserLine_.setDistrict(districtReferenceDto);
463+
462464
// newUserLine_.setArea(cellData.getValue());
463465
}
464-
466+
467+
468+
/* PLEASE MAKE SURE TO REMOVE THIS SETTING OF FLOAT UNTIL WE GET A CLEAR DESCRIPTION ON WETHER
469+
* IT SHOULD BE A COMPULSORY FIELD TO FILL WHEN UPLOADING CLUSTERS IN IMPORT --SEGUN
470+
*
471+
* REPEAT THE PROCESS IN THE ELSE STATEMENT WHEN THIS HAS BEEN FIXED
472+
*/
473+
newUserLine_.setFloating("");
474+
475+
476+
465477
newUserLinetoSave.add(newUserLine_);
466478

467479
} catch (NumberFormatException e) {
@@ -534,6 +546,15 @@ public Exception apply(ImportCellData cellData) {
534546
newUserLine_.setDistrict(districtReferenceDto);
535547
// newUserLine_.setArea(cellData.getValue());
536548
}
549+
550+
/* PLEASE MAKE SURE TO REMOVE THIS SETTING OF FLOAT UNTIL WE GET A CLEAR DESCRIPTION ON WETHER
551+
* IT SHOULD BE A COMPULSORY FIELD TO FILL WHEN UPLOADING CLUSTERS IN IMPORT --SEGUN
552+
*
553+
* REPEAT THE PROCESS IN THE IF STATEMENT WHEN THIS HAS BEEN FIXED
554+
*/
555+
newUserLine_.setFloating("");
556+
557+
537558

538559
newUserLinetoSave.add(newUserLine_);
539560

@@ -610,6 +631,15 @@ public Exception apply(ImportCellData cellData) {
610631
newUserLine.setDistrict(districtReferenceDto);
611632
// newUserLine.setArea(cellData.getValue());
612633
}
634+
635+
/* PLEASE MAKE SURE TO REMOVE THIS SETTING OF FLOAT UNTIL WE GET A CLEAR DESCRIPTION ON WETHER
636+
* IT SHOULD BE A COMPULSORY FIELD TO FILL WHEN UPLOADING CLUSTERS IN IMPORT --SEGUN
637+
*
638+
* REPEAT THE PROCESS IN THE ELSE STATEMENT WHEN THIS HAS BEEN FIXED
639+
*/
640+
newUserLine.setFloating("");
641+
642+
613643

614644
newUserLinetoSave.add(newUserLine);
615645

‎apmis-flow/src/main/java/com/cinoteck/application/views/configurations/ClusterView.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ private void clusterGrid() {
292292
grid.addColumn(CommunityDto::getName).setHeader(I18nProperties.getCaption(Captions.community))
293293
.setSortable(true).setResizable(true)
294294
.setTooltipGenerator(e -> I18nProperties.getCaption(Captions.community));
295-
grid.addColumn(clusterNumberRenderer).setHeader(I18nProperties.getCaption(Captions.clusterNumber))
295+
grid.addColumn(CommunityDto::getClusterNumber).setHeader(I18nProperties.getCaption(Captions.clusterNumber))
296296
.setSortable(true).setComparator(Comparator.comparing(CommunityDto::getClusterNumber))
297297
.setResizable(true).setTooltipGenerator(e -> I18nProperties.getCaption(Captions.clusterNumber))
298298
.setSortProperty("clusterNumber");
@@ -601,6 +601,8 @@ public Component addFilters() {
601601
relevanceStatusFilter.setClearButtonVisible(true);
602602
relevanceStatusFilter.addValueChangeListener(e -> {
603603
if (relevanceStatusFilter.getValue() == null) {
604+
System.out.println(" Nullll has beeen actiovated ===============");
605+
604606
EntityRelevanceStatus selectedStatus = e.getValue();
605607
criteria.relevanceStatus(selectedStatus);
606608
refreshGridData();
@@ -619,6 +621,7 @@ public Component addFilters() {
619621
refreshGridData();
620622

621623
} else if (relevanceStatusFilter.getValue().equals(EntityRelevanceStatus.ALL)) {
624+
System.out.println(" Alllll has beeen actiovated ===============");
622625

623626
subMenu.removeAll();
624627
// subMenu.addItem(I18nProperties.getCaption(Captions.actionDearchive),
@@ -628,6 +631,8 @@ public Component addFilters() {
628631
refreshGridData();
629632

630633
} else {
634+
635+
System.out.println(" Elswe has beeen actiovated ===============");
631636
subMenu.removeAll();
632637
subMenu.addItem(I18nProperties.getString(Strings.selectActiveArchivedRelevance));
633638
EntityRelevanceStatus selectedStatus = e.getValue();

‎apmis-flow/src/main/java/com/cinoteck/application/views/configurations/ImportDistrictDataDialog.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ public ImportDistrictDataDialog() {
324324
// stopButton.addThemeVariants(ButtonVariant.LUMO_PRIMARY);
325325
// stopButton.addClickListener(e -> stopIntervalCallback());
326326

327-
dialog.add(step2, lblImportTemplateInfo, downloadImportTemplate, step3, lblImportCsvFile,overWriteExistingData, upload, startDataImport,
327+
dialog.add(step2, lblImportTemplateInfo, downloadImportTemplate, step3, lblImportCsvFile,overWriteExistingData, upload, startImportDryRun, startDataImport,
328328
step5, lblDnldErrorReport, donloadErrorReport, anchorSpan);
329329

330330
//hacky: hide the anchor

‎apmis-flow/src/main/java/com/cinoteck/application/views/configurations/ProvinceDataDryRunner.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ protected ImportLineResult importDataFromCsvLine(String[] values, String[] entit
159159
// }else {
160160
writeImportError(values,
161161
new ImportErrorException(values[i], entityProperties[i]).getMessage()
162-
+ " | Region Name Exists ");
162+
+ " | Province Name Exists ");
163163
return ImportLineResult.ERROR;
164164
// }
165165
}

‎apmis-flow/src/main/java/com/cinoteck/application/views/configurations/ProvinceDataImporter.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ protected ImportLineResult importDataFromCsvLine(String[] values, String[] entit
156156
// }else {
157157
writeImportError(values,
158158
new ImportErrorException(values[i], entityProperties[i]).getMessage()
159-
+ " | Region Name Exists ");
159+
+ " | Province Name Exists ");
160160
return ImportLineResult.ERROR;
161161
// }
162162
}

‎sormas-backend/src/main/java/de/symeda/sormas/backend/infrastructure/community/CommunityFacadeEjb.java‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -684,12 +684,21 @@ public List<CommunityDto> getIndexList(CommunityCriteriaNew criteria, Integer fi
684684

685685
if (filter != null) {
686686

687-
687+
//System.out.println(criteria.getRelevanceStatus() + "criteria.getRelevanceStatus()=====================");
688688
if(criteria.getRelevanceStatus() == EntityRelevanceStatus.ARCHIVED) {
689+
690+
// System.out.println(criteria.getRelevanceStatus() + "criteria.getRelevanceStatus()=====================");
691+
689692
cq.where(filter, filterxx);
690693
} else if(criteria.getRelevanceStatus() == EntityRelevanceStatus.ALL) {
691-
cq.where(filter, filterxx);
694+
695+
// System.out.println(criteria.getRelevanceStatus() + "criteria.getRelevanceStatus()=====================");
696+
697+
cq.where(filter, filterxy);
692698
} else {
699+
700+
// System.out.println(criteria.getRelevanceStatus() + "criteria.getRelevanceStatus()=====================");
701+
693702
cq.where(filter, filterx);
694703
}
695704

‎sormas-backend/src/main/java/de/symeda/sormas/backend/infrastructure/district/DistrictDryRunFacadeEjb.java‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,9 @@ public DistrictDryRunDto save(@Valid DistrictDryRunDto dto, boolean allowMerge)
305305

306306
if (district == null) {
307307
List<DistrictReferenceDto> duplicates = getByName(dto.getName(), dto.getRegion(), true);
308-
if (!duplicates.isEmpty()) {
308+
if((duplicates == null || duplicates.isEmpty()) && (dto.getName() != null || dto.getRegion()!=null)) {
309+
310+
}else if (!duplicates.isEmpty() && (dto.getName() != null || dto.getRegion()!=null)){
309311
if (allowMerge) {
310312
String uuid = duplicates.get(0).getUuid();
311313
district = service.getByUuid(uuid);
@@ -316,6 +318,19 @@ public DistrictDryRunDto save(@Valid DistrictDryRunDto dto, boolean allowMerge)
316318
I18nProperties.getValidationError(Validations.importDistrictAlreadyExists));
317319
}
318320
}
321+
322+
System.out.println(duplicates + " ============================ duplicatesduplicates");
323+
// if (!duplicates.isEmpty()) {
324+
// if (allowMerge) {
325+
// String uuid = duplicates.get(0).getUuid();
326+
// district = service.getByUuid(uuid);
327+
// DistrictDryRunDto dtoToMerge = getDistrictByUuid(uuid);
328+
// dto = DtoHelper.copyDtoValues(dtoToMerge, dto, true);
329+
// } else {
330+
// throw new ValidationRuntimeException(
331+
// I18nProperties.getValidationError(Validations.importDistrictAlreadyExists));
332+
// }
333+
// }
319334
}
320335

321336
district = fillOrBuildEntity(dto, district, true);

0 commit comments

Comments
 (0)