Skip to content

Commit

Permalink
Merge pull request #582 from DevSeg/team_collaboration_branch
Browse files Browse the repository at this point in the history 
Team collaboration branch
  • Loading branch information
@sundayAdu
sundayAdu authored Nov 29, 2023
2 parents d4533e4 + b01614f commit dbceb6f
Show file tree
Hide file tree
Showing 17 changed files with 690 additions and 164 deletions.
10 changes: 9 additions & 1 deletion apmis-flow/frontend/styles/custom-grid-styles.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,12 @@
background: rgb(255, 240, 227) !important ;
color: black;
/*color: rgb(13, 105, 56) !important;*/
}
}

[part~="cell"].isDistictLevelData {
/*background: rgb(255, 240, 227) !important ;*/
/*color: black;*/
/* color: rgb(13, 105, 56) !important;*/
}


93 changes: 47 additions & 46 deletions apmis-flow/src/main/java/com/cinoteck/application/views/campaigndata/CampaignDataView.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,10 @@ public class CampaignDataView extends VerticalLayout {

private DataProvider<CampaignFormDataIndexDto, CampaignFormDataCriteria> dataProvider;

Column<CampaignFormDataIndexDto> clusterNumberColumn;

Column<CampaignFormDataIndexDto> ccodeColumn;

public CampaignDataView() {

if (I18nProperties.getUserLanguage() == null) {
Expand Down Expand Up @@ -292,7 +296,7 @@ private void createCampaignDataFilter() {
// && userProvider.getUser().getArea() != null)) {
if (userProvider.getUser().getLanguage().toString().equals("Pashto")) {
AreaReferenceDto singleArea = userProvider.getUser().getArea();
AreaDto hgsghsag = FacadeProvider.getAreaFacade().getByUuid(singleArea.getUuid());
AreaDto hgsghsag = FacadeProvider.getAreaFacade().getByUuid(singleArea.getUuid());
AreaReferenceDto singleAreatw0 = new AreaReferenceDto(hgsghsag.getUuid(), hgsghsag.getFa_af());
regionCombo.setValue(singleAreatw0);
} else if (userProvider.getUser().getLanguage().toString().equals("Dari")) {
Expand Down Expand Up @@ -586,12 +590,12 @@ else if (!userProvider.getUser().getUserRoles().contains(UserRole.AREA_SURVEILLA
//
// grid.setSelectionMode(SelectionMode.NONE);
// grid.getElement().executeJs("this.getDataProvider().refreshAll()");
System.out.println(grid.getColumns().size()+ ": pagesize7777777777777777777777");
System.out.println(grid.getColumns().size() + ": pagesize7777777777777777777777");
// + grid.getElement().executeJs("this.getDataProvider().refreshAll()"));
// removeColumnsSelectionn();
// }
remove(grid);
//grid.removeAllColumns();
// grid.removeAllColumns();
configureGrid(criteria);
// reload();
updateRowCount();
Expand Down Expand Up @@ -641,6 +645,7 @@ else if (!userProvider.getUser().getUserRoles().contains(UserRole.AREA_SURVEILLA

}
updateRowCount();
configureColumnStyles(criteria);

});

Expand Down Expand Up @@ -1045,15 +1050,15 @@ public void deleteAllSelectedItems(Collection<CampaignFormDataIndexDto> selected
}

public void reload() {

criteria.campaign(campaignz.getValue());
criteria.setFormType(campaignPhase.getValue().toString());
criteria.setCampaignFormMeta(campaignFormCombo.getValue());
criteria.area(regionCombo.getValue());
criteria.region(provinceCombo.getValue());
criteria.district(districtCombo.getValue());
criteria.community(clusterCombo.getValue());

grid.getDataProvider().refreshAll();
}

Expand Down Expand Up @@ -1165,10 +1170,10 @@ private void configureGrid(CampaignFormDataCriteria criteria) {
grid.addColumn(CampaignFormDataIndexDto.COMMUNITY).setHeader(I18nProperties.getCaption(Captions.community))
.setSortable(true).setResizable(true).setAutoWidth(true)
.setTooltipGenerator(e -> I18nProperties.getCaption(Captions.community));
grid.addColumn(clusterNumberRender).setHeader(I18nProperties.getCaption(Captions.clusterNumber))
.setSortable(true).setResizable(true).setAutoWidth(true)
.setTooltipGenerator(e -> I18nProperties.getCaption(Captions.clusterNumber));
grid.addColumn(cCodeRender).setHeader(I18nProperties.getCaption(Captions.Community_externalID))
clusterNumberColumn = grid.addColumn(clusterNumberRender).setKey("clusterNumber")
.setHeader(I18nProperties.getCaption(Captions.clusterNumber)).setSortable(true).setResizable(true)
.setAutoWidth(true).setTooltipGenerator(e -> I18nProperties.getCaption(Captions.clusterNumber));
ccodeColumn = grid.addColumn(cCodeRender).setHeader(I18nProperties.getCaption(Captions.Community_externalID))
.setSortable(true).setResizable(true).setAutoWidth(true)
.setTooltipGenerator(e -> I18nProperties.getCaption(Captions.Community_externalID));
TextRenderer<CampaignFormDataIndexDto> formDateRenderer = new TextRenderer<>(dto -> {
Expand Down Expand Up @@ -1212,11 +1217,12 @@ private void configureGrid(CampaignFormDataCriteria criteria) {
grid.addColumn(CampaignFormDataIndexDto.COMMUNITY).setHeader(I18nProperties.getCaption(Captions.community))
.setSortable(true).setResizable(true).setAutoWidth(true)
.setTooltipGenerator(e -> I18nProperties.getCaption(Captions.community));
grid.addColumn(clusterNumberRender).setHeader(I18nProperties.getCaption(Captions.clusterNumber))
.setSortable(true).setResizable(true).setAutoWidth(true)
.setTooltipGenerator(e -> I18nProperties.getCaption(Captions.clusterNumber));
grid.addColumn(cCodeRender).setHeader(I18nProperties.getCaption(Captions.Community_externalID))
.setSortable(true).setResizable(true).setAutoWidth(true)
clusterNumberColumn = grid.addColumn(clusterNumberRender).setKey("clusterNumber")
.setHeader(I18nProperties.getCaption(Captions.clusterNumber)).setSortable(true).setResizable(true)
.setAutoWidth(true).setTooltipGenerator(e -> I18nProperties.getCaption(Captions.clusterNumber));
ccodeColumn = grid.addColumn(cCodeRender)
.setHeader(I18nProperties.getCaption(Captions.Community_externalID)).setSortable(true)
.setResizable(true).setAutoWidth(true)
.setTooltipGenerator(e -> I18nProperties.getCaption(Captions.Community_externalID));
TextRenderer<CampaignFormDataIndexDto> formDateRenderer = new TextRenderer<>(dto -> {
Date timestamp = dto.getFormDate();
Expand Down Expand Up @@ -1266,13 +1272,14 @@ private void configureGrid(CampaignFormDataCriteria criteria) {
grid.addColumn(CampaignFormDataIndexDto.COMMUNITY).setHeader(I18nProperties.getCaption(Captions.community))
.setSortable(true).setResizable(true).setAutoWidth(true)
.setTooltipGenerator(e -> I18nProperties.getCaption(Captions.community));
grid.addColumn(CampaignFormDataIndexDto.COMMUNITYNUMBER)
clusterNumberColumn = grid.addColumn(CampaignFormDataIndexDto.COMMUNITYNUMBER)
.setHeader(I18nProperties.getCaption(Captions.clusterNumber)).setSortable(true).setResizable(true)
.setAutoWidth(true).setTooltipGenerator(e -> I18nProperties.getCaption(Captions.clusterNumber));
grid.addColumn(CampaignFormDataIndexDto.CCODE)
ccodeColumn = grid.addColumn(CampaignFormDataIndexDto.CCODE)
.setHeader(I18nProperties.getCaption(Captions.Community_externalID)).setSortable(true)
.setResizable(true).setAutoWidth(true)
.setTooltipGenerator(e -> I18nProperties.getCaption(Captions.Community_externalID));

TextRenderer<CampaignFormDataIndexDto> formDateRenderer = new TextRenderer<>(dto -> {
Date timestamp = dto.getFormDate();
SimpleDateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy");
Expand Down Expand Up @@ -1300,22 +1307,6 @@ private void configureGrid(CampaignFormDataCriteria criteria) {
dataProvider = DataProvider.fromFilteringCallbacks(this::fetchCampaignFormData, this::countCampaignFormData);
grid.setDataProvider(dataProvider);

// grid.asSingleSelect().addValueChangeListener(e -> {
//
// // editCampaignFormData(e.getValue());
// CampaignFormDataDto formData = FacadeProvider.getCampaignFormDataFacade()
// .getCampaignFormDataByUuid(e.getValue().getUuid());
//
//// CampaignFormMetaDto formDatax = FacadeProvider.getCampaignFormMetaFacade()
//// .getCampaignFormMetaByUuid(e.getValue().getUuid());
//// boolean fff = formDatax.isDistrictentry();
// CampaignFormDataEditForm cam = new CampaignFormDataEditForm(formData.getCampaignFormMeta(),
// campaignz.getValue(), true, formData.getUuid(), grid, false);
//
// });

// grid.setSelectionMode(SelectionMode.SINGLE);

if (userProvider.getUser().getUsertype() == UserType.EOC_USER) {
boolean isPublished = FacadeProvider.getCampaignFacade().isPublished(campaignz.getValue().getUuid());

Expand Down Expand Up @@ -1355,20 +1346,6 @@ private void configureGrid(CampaignFormDataCriteria criteria) {
});
}

// if (grid.getSelectionModel() == SelectionMode.SINGLE) {
// System.out.println("3333333333333333333333");
//
// grid.asSingleSelect().addValueChangeListener(e -> {
// CampaignFormDataDto formData = FacadeProvider.getCampaignFormDataFacade()
// .getCampaignFormDataByUuid(e.getValue().getUuid());
//
// CampaignFormDataEditForm cam = new CampaignFormDataEditForm(formData.getCampaignFormMeta(),
// campaignz.getValue(), true, formData.getUuid(), grid, false);
// });
// }

//

exporter = GridExporter.createFor(grid);
exporter.setAutoAttachExportButtons(false);
exporter.setTitle(I18nProperties.getCaption(Captions.campaignDataInformation));
Expand Down Expand Up @@ -1405,6 +1382,30 @@ private void configureColumnStyles(CampaignFormDataCriteria criteria) {
return "";
}
});

CampaignFormMetaDto formData = FacadeProvider.getCampaignFormMetaFacade()
.getCampaignFormMetaByUuid(campaignFormCombo.getValue().getUuid());

boolean isDistictLevelData = formData.isDistrictentry();
// newColumn.setId("districtEntry");
// System.out.println( newColumn.getId() + "****************************888888888888888888888" + newColumn.getKey() ) ;

grid.getColumnByKey("clusternumber").setClassNameGenerator((v) -> {
if (isDistictLevelData) {
// System.out.println("DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDISTRICT LEVEL DAATA ");
clusterNumberColumn.setVisible(false);
ccodeColumn.setVisible(false);
return "isDistictLevelData";

} else {

// System.out.println("NORT DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDISTRICT LEVEL DAATA ");
clusterNumberColumn.setVisible(true);
ccodeColumn.setVisible(true);
return "";
}
});

}

private String clusterNumberLabelGenerator(CommunityReferenceDto communityReferenceDto) {
Expand Down
131 changes: 93 additions & 38 deletions apmis-flow/src/main/java/com/cinoteck/application/views/dashboard/DashboardView.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,10 +176,10 @@ public DashboardView() {
// campaingYears.clear();
// campaingYears.addAll(setDeduplicated);

Set<String> setDeduplicated = new HashSet<>(campaingYears);
Set<String> setDeduplicated = new HashSet<>(campaingYears);
campaignYear.setItems(setDeduplicated);
campaignYear.setItemLabelGenerator(item -> {

switch (userProvider.getUser().getLanguage().toString()) {
case "Pashto":
arabicFormat = NumberFormat.getInstance(new Locale("ps"));
Expand Down Expand Up @@ -295,6 +295,8 @@ public DashboardView() {

province.getStyle().set("padding-top", "0px");
province.setClassName("col-sm-6, col-xs-6");
province.setClassName("col-sm-6, col-xs-6");

// province.setEnabled(false);

district.setLabel(I18nProperties.getCaption(Captions.district));
Expand Down Expand Up @@ -398,6 +400,8 @@ public DashboardView() {

});

configureFilterByUserRoles();

region.addValueChangeListener(e -> {
changeCampaignJuridictionLevel(campaignJurisdictionLevel.AREA);

Expand All @@ -419,16 +423,6 @@ public DashboardView() {
groupby.setValue(campaignJurisdictionLevel.AREA);

}

// if(province.getValue() != null ) {
// province.clear();
// }
//
// if( district.getValue() != null ) {
//
// district.clear();
// }

});

province.setClearButtonVisible(true);
Expand Down Expand Up @@ -726,32 +720,93 @@ private String getLabelForEnum(CampaignPhase campaignPhase) {
}
}

// private ItemLabelGenerator<String> getLabel() {
// String finalString = "";
// NumberFormat arabicFormat = NumberFormat.getInstance();
//
// for (String string : campaingYears) {
// switch (userProvider.getUser().getLanguage().toString()) {
// case "Pashto":
// arabicFormat = NumberFormat.getInstance(new Locale("ps"));
// finalString = String.valueOf(arabicFormat.format(Long.parseLong(string)));
// break;
// case "Dari":
// arabicFormat = NumberFormat.getInstance(new Locale("fa"));
// finalString = String.valueOf(arabicFormat.format(Long.parseLong(string)));
// break;
// default:
// arabicFormat = NumberFormat.getInstance(new Locale("en"));
// finalString = String.valueOf(arabicFormat.format(Long.parseLong(string)));
// break;
// }
//
// // If you only want to process the first element and then return, you can break here
// // break;
// }
//
// return finalString;
// }
public void generateProvinceComboItems() {
province.clear();
changeCampaignJuridictionLevel(campaignJurisdictionLevel.AREA);

if (region.getValue() != null) {
dataProvider.setArea(region.getValue());
if (userProvider.getUser().getLanguage() != null) {
if (userProvider.getUser().getLanguage().toString().equals("Pashto")) {
provincesx = FacadeProvider.getRegionFacade().getAllActiveByAreaPashto(region.getValue().getUuid());
province.setItems(provincesx);
} else if (userProvider.getUser().getLanguage().toString().equals("Dari")) {
provincesx = FacadeProvider.getRegionFacade().getAllActiveByAreaDari(region.getValue().getUuid());
province.setItems(provincesx);
} else {
provinces = FacadeProvider.getRegionFacade().getAllActiveByArea(region.getValue().getUuid());
province.setItems(provinces);
}
} else {
provinces = FacadeProvider.getRegionFacade().getAllActiveByArea(region.getValue().getUuid());
province.setItems(provinces);
}
province.setEnabled(true);
groupby.setValue(campaignJurisdictionLevel.REGION);
} else {
groupby.setValue(campaignJurisdictionLevel.AREA);

}

}

public void generateDistrictComboItems() {

System.out.println("================1111111111111");
district.clear();

if (province.getValue() != null) {
changeCampaignJuridictionLevel(campaignJurisdictionLevel.REGION);
groupby.setValue(campaignJurisdictionLevel.REGION);
dataProvider.setRegion(province.getValue());
if (userProvider.getUser().getLanguage().toString().equals("Pashto")) {
districtsx = FacadeProvider.getDistrictFacade()
.getAllActiveByRegionPashto(province.getValue().getUuid());
district.setItems(districtsx);
} else if (userProvider.getUser().getLanguage().toString().equals("Dari")) {
districtsx = FacadeProvider.getDistrictFacade().getAllActiveByRegionDari(province.getValue().getUuid());
district.setItems(districtsx);
} else {
districts = FacadeProvider.getDistrictFacade().getAllActiveByRegion(province.getValue().getUuid());
district.setItems(districts);
}
district.setEnabled(true);
groupby.setValue(campaignJurisdictionLevel.DISTRICT);

} else {
changeCampaignJuridictionLevel(campaignJurisdictionLevel.AREA);
dataProvider.setRegion(province.getValue());
if (district.getValue() != null) {
district.clear();
district.setEnabled(false);
}
groupby.setValue(campaignJurisdictionLevel.AREA);
}

}

public void configureFilterByUserRoles() {
if (userProvider.getUser().getArea() != null) {
region.setValue(userProvider.getUser().getArea());
dataProvider.setArea(userProvider.getUser().getArea());
region.setEnabled(false);
generateProvinceComboItems();
}

if (userProvider.getUser().getRegion() != null) {
province.setValue(userProvider.getUser().getRegion());
dataProvider.setRegion(userProvider.getUser().getRegion());
province.setEnabled(false);
generateDistrictComboItems();
}

if (userProvider.getUser().getDistrict() != null) {
district.setValue(userProvider.getUser().getDistrict());
dataProvider.setDistrict(userProvider.getUser().getDistrict());
district.setEnabled(false);
// generateDistrictComboItems();
}
}

@Override
public void beforeEnter(BeforeEnterEvent event) {
Expand Down
Loading

0 comments on commit dbceb6f

Please sign in to comment.