Skip to content

Commit a47988d

Browse files
DevSegDevSeg
authored
Merge pull request #674 from DevSeg/team_collaboration_branch
Preparing For July Campaign And Rounding Off Functional Fixes
2 parents 23028d5 + 33447a0 commit a47988d

File tree

50 files changed

+2704
-652
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+2704
-652
lines changed

‎apmis-flow/frontend/styles/toggle-button-group.css‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
2-
.toggle-button-group vaadin-horizontal-layout vaadin-button:focus{
3-
background-color: green;
4-
color:white;
1+
.toggle-button-group vaadin-horizontal-layout vaadin-button{
2+
background-color: white;
3+
color: green;
54
}
65

7-
.toggle-button-group vaadin-horizontal-layout vaadin-button{
6+
.toggle-button-group vaadin-horizontal-layout vaadin-button:focus{
87
background-color: white;
98
color: green;
109
}
1110

11+
1212
.toggle-button-group-button-h {
1313
border-style: solid;
1414
border-color: var(--_lumo-button-primary-background-color, var(--lumo-primary-color));
@@ -51,3 +51,8 @@ background-color: white;
5151
border-width: 1px 1px 1px 1px;
5252
}
5353

54+
.selectedItemX {
55+
background-color: white !important;
56+
color: green !important;
57+
}
58+

‎apmis-flow/frontend/themes/apmis-theme/components/vaadin-button.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
:host(:not([theme~="primary"]):not([theme~="error"]):not([theme~="success"])) {
77
color: white;
88
background: #0D6938;
9-
min-width: auto !important!;
9+
min-width: auto !important;
1010
}
1111
:host([focus-ring]:not([theme~="tertiary"])) {
1212
box-shadow: 0 0 0 2px var(--lumo-primary-color-50pct), inset 0 0 0 1px var(--lumo-primary-color);

‎apmis-flow/package-lock.json‎

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎apmis-flow/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@
108108
"@vaadin/vertical-layout": "23.3.7",
109109
"@vaadin/virtual-list": "23.3.7",
110110
"construct-style-sheets-polyfill": "3.1.0",
111-
"date-fns": "2.16.0",
111+
"date-fns": "2.29.3",
112112
"highcharts": "^9.2.2",
113113
"line-awesome": "1.3.0",
114114
"lit": "2.6.1",
@@ -253,7 +253,7 @@
253253
"@vaadin/virtual-list": "23.3.7",
254254
"@webcomponents/webcomponentsjs": "^2.2.10",
255255
"construct-style-sheets-polyfill": "3.1.0",
256-
"date-fns": "2.16.0",
256+
"date-fns": "2.29.3",
257257
"line-awesome": "1.3.0",
258258
"lit": "2.6.1",
259259
"lumo-css-framework": "^4.0.10"
@@ -282,7 +282,7 @@
282282
"workbox-precaching": "6.5.4",
283283
"workbox-webpack-plugin": "6.5.0"
284284
},
285-
"hash": "48d42c7e94d40dc0b7f411335b394bf245e319f2fe4e8449aa52a9e9f820fd98"
285+
"hash": "6f2e723f95e945bdcccba45f739f64e0e4bb060a7759ff4f15e69638a59109f1"
286286
},
287287
"overrides": {
288288
"@vaadin/bundles": "$@vaadin/bundles",

‎apmis-flow/pom.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,12 @@
212212
<artifactId>firebase-admin</artifactId>
213213
<version>9.2.0</version>
214214
</dependency>
215+
216+
<dependency>
217+
<groupId>org.apache.commons</groupId>
218+
<artifactId>commons-csv</artifactId>
219+
<version>1.8</version>
220+
</dependency>
215221
<!-- https://mvnrepository.com/artifact/org.vaadin.highcharts/highcharts
216222
<dependency>
217223
<groupId>org.vaadin.highcharts</groupId>

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

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
import com.cinoteck.application.views.dashboard.AnalyticsDashboardView;
2020
import com.cinoteck.application.views.dashboard.DashboardView;
2121
import com.cinoteck.application.views.myaccount.MyAccountView;
22+
//import com.cinoteck.application.views.pivot.PivotTableView;
23+
//import com.cinoteck.application.views.pivot.PivotView;
2224
import com.cinoteck.application.views.reports.ReportView;
2325
import com.cinoteck.application.views.support.SupportView;
2426
import com.cinoteck.application.views.uiformbuilder.FormBuilderView;
@@ -253,7 +255,7 @@ private AppNav createNavigation() {
253255
}
254256

255257
// if (userProvider.hasUserRight(UserRight.USER_RIGHTS_MANAGE)) {
256-
// nav.addItem(new AppNavItem("Pivot", PivotView.class, VaadinIcon.TREE_TABLE, "navitem"));
258+
// nav.addItem(new AppNavItem(I18nProperties.getCaption(Captions.userProfile), PivotView.class, VaadinIcon.TREE_TABLE, "navitem"));
257259
// }
258260

259261
// nav.addItem(new AppNavItem("Pivot", PivotTableView.class,
@@ -288,7 +290,18 @@ private AppNav createNavigation() {
288290
nav.addItem(
289291
new AppNavItem("Notification", VaadinIcon.SERVER, "navitem", notification, UserMessageView.class));
290292
}
293+
294+
// nav.addItem(new AppNavItem(I18nProperties.getCaption(Captions.userProfile), PivotView.class, VaadinIcon.TREE_TABLE, "navitem"));
291295

296+
// nav.addItem(new AppNavItem(I18nProperties.getCaption("Pivot View"),
297+
// PivotView.class, VaadinIcon.TREE_TABLE, "navitem"));
298+
299+
300+
// nav.addItem(new AppNavItem(I18nProperties.getCaption("Pivot Table View"),
301+
// PivotTableView.class, VaadinIcon.TREE_TABLE, "navitem"));
302+
303+
304+
292305
if (nav != null) {
293306
nav.addClassName("active");
294307
}

‎apmis-flow/src/main/java/com/cinoteck/application/views/campaign/CampaignsView.java‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@
6767
import de.symeda.sormas.api.i18n.I18nProperties;
6868
import de.symeda.sormas.api.i18n.Strings;
6969
import de.symeda.sormas.api.infrastructure.area.AreaReferenceDto;
70+
import de.symeda.sormas.api.infrastructure.community.CommunityDto;
7071
import de.symeda.sormas.api.user.UserRight;
7172
import de.symeda.sormas.api.utils.ValidationRuntimeException;
7273

@@ -198,23 +199,23 @@ private void campaignsGrid() {
198199

199200
if (userProvider.getUser().getLanguage().toString().equals("Pashto")) {
200201
grid.addColumn(startDateRendererPashto).setHeader(I18nProperties.getCaption(Captions.Campaign_startDate))
201-
.setSortable(true).setResizable(true);
202-
grid.addColumn(endDateRendererPashto).setHeader(I18nProperties.getCaption(Captions.Campaign_endDate))
202+
.setSortable(true).setComparator(Comparator.comparing(CampaignIndexDto::getStartDate)).setResizable(true);
203+
grid.addColumn(endDateRendererPashto).setComparator(Comparator.comparing(CampaignIndexDto::getEndDate)).setHeader(I18nProperties.getCaption(Captions.Campaign_endDate))
203204
.setSortable(true).setResizable(true);
204205
grid.addColumn(campaignYearRender).setHeader(I18nProperties.getCaption(Captions.campaignYear))
205206
.setSortable(true).setResizable(true);
206207
} else if (userProvider.getUser().getLanguage().toString().equals("Dari")) {
207208
grid.addColumn(startDateRendererDari).setHeader(I18nProperties.getCaption(Captions.Campaign_startDate))
208-
.setSortable(true).setResizable(true);
209-
grid.addColumn(endDateRendererDari).setHeader(I18nProperties.getCaption(Captions.Campaign_endDate))
209+
.setSortable(true).setComparator(Comparator.comparing(CampaignIndexDto::getStartDate)).setResizable(true);
210+
grid.addColumn(endDateRendererDari).setComparator(Comparator.comparing(CampaignIndexDto::getEndDate)).setHeader(I18nProperties.getCaption(Captions.Campaign_endDate))
210211
.setSortable(true).setResizable(true);
211212
grid.addColumn(campaignYearRender).setHeader(I18nProperties.getCaption(Captions.campaignYear))
212213
.setSortable(true).setResizable(true);
213214
} else {
214215
grid.addColumn(startDateRenderer).setHeader(I18nProperties.getCaption(Captions.Campaign_startDate))
215-
.setSortable(true).setResizable(true);
216+
.setSortable(true).setComparator(Comparator.comparing(CampaignIndexDto::getStartDate)).setResizable(true);
216217
grid.addColumn(endDateRenderer).setHeader(I18nProperties.getCaption(Captions.Campaign_endDate))
217-
.setSortable(true).setResizable(true);
218+
.setSortable(true).setComparator(Comparator.comparing(CampaignIndexDto::getEndDate)).setResizable(true);
218219
grid.addColumn(CampaignIndexDto.CAMPAIGN_YEAR).setHeader(I18nProperties.getCaption(Captions.campaignYear))
219220
.setSortable(true).setResizable(true);
220221
}
@@ -270,6 +271,7 @@ private void createFilterBar() {
270271
filterLayout.setVisible(true);
271272

272273
filterDisplayToggle.addClickListener(e -> {
274+
I18nProperties.setUserLanguage(userProvider.getUser().getLanguage());
273275
if (!filterLayout.isVisible()) {
274276
filterLayout.setVisible(true);
275277
filterDisplayToggle.setText(I18nProperties.getCaption(Captions.hideFilters));

‎apmis-flow/src/main/java/com/cinoteck/application/views/campaign/ImportPopulationDataDialog.java‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,15 +180,23 @@ public ImportPopulationDataDialog(InfrastructureType infrastructureType, Campaig
180180

181181

182182
try {
183+
184+
System.out.println("Start import Clicked + 111111111111111111111111111111");
183185

184186
CampaignDto acmpDto = FacadeProvider.getCampaignFacade().getByUuid(camapigndto.getUuid());
185187

186188
DataImporter importer = new PopulationDataImporter(file_, srDto, acmpDto, ValueSeparator.COMMA, overWrite);
187189
importer.startImport(this::extendDownloadErrorReportButton, null, false, UI.getCurrent(), true);
188-
} catch (IOException | CsvValidationException e) {
190+
} catch (IOException e) {
189191
Notification.show(
190192
I18nProperties.getString(Strings.headingImportFailed) +" : "+
191193
I18nProperties.getString(Strings.messageImportFailed));
194+
} catch (CsvValidationException e1) {
195+
// TODO Auto-generated catch block
196+
Notification.show(
197+
I18nProperties.getString(Strings.headingImportFailed) +" : "+
198+
I18nProperties.getString(Strings.messageImportFailed));
199+
e1.printStackTrace();
192200
}
193201
finally {
194202

‎apmis-flow/src/main/java/com/cinoteck/application/views/campaigndata/CampaignDataView.java‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,14 @@
2222
import javax.sound.midi.SysexMessage;
2323
import javax.ws.rs.core.Form;
2424

25+
import org.jsoup.select.Evaluator.ContainsData;
26+
2527
import com.cinoteck.application.UserProvider;
2628
import com.cinoteck.application.views.MainLayout;
2729
import com.cinoteck.application.views.campaign.CampaignDataImportDialog;
2830
import com.cinoteck.application.views.campaign.CampaignForm;
2931
import com.cinoteck.application.views.campaign.ImportPopulationDataDialog;
32+
import com.cinoteck.application.views.utils.DownloadTransposedDaywiseDataUtility;
3033
import com.cinoteck.application.views.utils.gridexporter.GridExporter;
3134
import com.opencsv.bean.StatefulBeanToCsv;
3235
import com.opencsv.bean.StatefulBeanToCsvBuilder;
@@ -139,6 +142,8 @@ public class CampaignDataView extends VerticalLayout {
139142
List<CommunityReferenceDto> communities;
140143
List<CampaignFormMetaReferenceDto> campaignForms;
141144
Anchor anchor = new Anchor("", I18nProperties.getCaption(Captions.export));
145+
Anchor transposdeDataAnchor = new Anchor("", I18nProperties.getCaption(Captions.export)+ "Transposed Data");
146+
142147
Icon icon = VaadinIcon.UPLOAD_ALT.create();
143148
Paragraph countRowItems;
144149
UserProvider userProvider = new UserProvider();
@@ -242,12 +247,17 @@ private void createCampaignDataFilter() {
242247

243248
Button exportButton = new Button(I18nProperties.getCaption(Captions.export));
244249
exportButton.setIcon(new Icon(VaadinIcon.UPLOAD));
250+
251+
Button exportTransposedDataButton = new Button(I18nProperties.getCaption(Captions.export) +"Transposed Data");
252+
exportTransposedDataButton.setIcon(new Icon(VaadinIcon.UPLOAD));
253+
245254
exportButton.addClickListener(e -> {
246255
anchor.getElement().callJsFunction("click");
247256
});
248257

249258
actionButtonlayout.add(campaignYear, campaignz, campaignPhase, newForm, importFormData, exportButton, anchor);
250259
anchor.getStyle().set("display", "none");
260+
transposdeDataAnchor.getStyle().set("display", "none");
251261

252262
HorizontalLayout level1Filters = new HorizontalLayout();
253263
level1Filters.setPadding(false);
@@ -266,6 +276,7 @@ private void createCampaignDataFilter() {
266276
verifiedStatusCombo, publishedStatusCombo, importanceSwitcher, resetHandler, rightFloat);
267277

268278
displayFilters.addClickListener(e -> {
279+
I18nProperties.setUserLanguage(userProvider.getUser().getLanguage());
269280
if (!level1Filters.isVisible()) {
270281
actionButtonlayout.setVisible(true);
271282
level1Filters.setVisible(true);
@@ -715,6 +726,23 @@ else if (!userProvider.getUser().getUserRoles().contains(UserRole.AREA_SURVEILLA
715726

716727
reload();
717728
configureColumnStyles(criteria);
729+
730+
//Known problem around here , depending on the number of times this filter value changes
731+
//the export button would download a file with the numbe rof criteria that has baaen send out
732+
//i.e if this filter value changes 10 times, the next time you click the button, it downloads 10 files
733+
//if it chnges again and you click the button, it down loads 11 times
734+
// if(e.getValue().toString().contains("Day 1")) {
735+
// actionButtonlayout.add(exportTransposedDataButton, transposdeDataAnchor);
736+
//
737+
//
738+
// DownloadTransposedDaywiseDataUtility downloadTransposedDaywiseDataUtility = new DownloadTransposedDaywiseDataUtility();
739+
// transposdeDataAnchor.setHref(downloadTransposedDaywiseDataUtility.createTransposedDataFromIndexListDemox2(criteria));
740+
// transposdeDataAnchor.getElement().setAttribute("download", true);
741+
// exportTransposedDataButton.addClickListener(ex->{
742+
// transposdeDataAnchor.getElement().callJsFunction("click");
743+
// });
744+
// };
745+
718746
} else {
719747

720748
importanceSwitcher.clear();
@@ -723,7 +751,11 @@ else if (!userProvider.getUser().getUserRoles().contains(UserRole.AREA_SURVEILLA
723751
}
724752
updateRowCount();
725753
configureColumnStyles(criteria);
754+
755+
756+
726757

758+
727759
});
728760

729761
regionCombo.setClearButtonVisible(true);

0 commit comments

Comments
 (0)