gCubeSystem
/
accounting-manager
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

69: Create new Accounting Portlet 

Task-Url: https://support.d4science.org/issues/69

Added constraints on start and end date


git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/admin/accounting-manager@119784 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Giancarlo Panichi 2015-10-15 10:02:28 +00:00
parent 8bb95fa2f5
commit 2ff07e0bb2
2 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/main/java/org/gcube/portlets/admin/accountingmanager/client/filters/AccountingPeriodPanel.java
View File

@ -44,20 +44,20 @@ public class AccountingPeriodPanel extends SimpleContainer {
.getFormat(PredefinedFormat.YEAR_MONTH_DAY);
private DateTimeFormat dtfYear = DateTimeFormat
.getFormat(PredefinedFormat.YEAR);
private DateTimeFormat dtfYearMonthDay = DateTimeFormat
.getFormat("yyyy-MM-dd");
private DateTimeFormat dtfShort = DateTimeFormat
.getFormat(PredefinedFormat.DATE_SHORT);
private EventBus eventBus;
private DateField startDate;
private DateField endDate;
private ListStore<AccountingPeriodMode> storeCombo;
private ComboBox<AccountingPeriodMode> comboPeriodMode;
private AccountingPeriodPanel thisPanel;
public AccountingPeriodPanel(EventBus eventBus) {
super();
Log.debug("AccountingPeriodPanel");
this.eventBus = eventBus;
thisPanel=this;
init();
create();
bindToEvents();
@ -120,6 +120,7 @@ public class AccountingPeriodPanel extends SimpleContainer {
case DAILY:
case HOURLY:
case MINUTELY:
case YEARLY:
break;
case MONTHLY:
Date monthStartDate = event.getValue();
@ -127,13 +128,13 @@ public class AccountingPeriodPanel extends SimpleContainer {
startDate.setValue(monthStartDate);
startDate.redraw();
break;
case YEARLY:
Date yearStartDate = event.getValue();
/*Date yearStartDate = event.getValue();
String currentYearS = dtfYear.format(yearStartDate);
Log.debug("YearStartSet=" + currentYearS + "-01-01");
Date currentYearGen;
try {
currentYearGen = dtfYearMonthDay.parse(currentYearS
currentYearGen = dtfShort.parse(currentYearS
+ "-01-01");
} catch (Exception e) {
Log.debug("Error: "+e.getLocalizedMessage());
@ -142,15 +143,14 @@ public class AccountingPeriodPanel extends SimpleContainer {
startDate.reset();
return;
}
Log.debug("CurrentYearGen="+dtf.format(currentYearGen));
Log.debug("CurrentYearGen="+dtfShort.format(currentYearGen));
startDate.clear();
startDate.setValue(currentYearGen);
startDate.redraw();
break;
break;*/
default:
break;
}
thisPanel.forceLayout();
}
});
@ -184,6 +184,7 @@ public class AccountingPeriodPanel extends SimpleContainer {
case DAILY:
case HOURLY:
case MINUTELY:
case YEARLY:
break;
case MONTHLY:
Date monthEndDate = event.getValue();
@ -193,13 +194,12 @@ public class AccountingPeriodPanel extends SimpleContainer {
endDate.setValue(monthEndDate);
endDate.redraw();
break;
case YEARLY:
Date yearEndDate = event.getValue();
/*Date yearEndDate = event.getValue();
String currentYearS = dtfYear.format(yearEndDate);
Log.debug("YearEndSet=" + currentYearS + "-12-31");
Date yearEndDec;
try {
yearEndDec = dtfYearMonthDay.parse(currentYearS
yearEndDec = dtfShort.parse(currentYearS
+ "-12-31");
} catch (Exception e) {
Log.debug("Error: "+e.getLocalizedMessage());
@ -208,15 +208,15 @@ public class AccountingPeriodPanel extends SimpleContainer {
endDate.reset();
return;
}
Log.debug("YearEndDec="+dtf.format(yearEndDec));
Log.debug("YearEndDec="+dtfShort.format(yearEndDec));
endDate.clear();
endDate.setValue(yearEndDec);
endDate.redraw();
break;
break;*/
default:
break;
}
thisPanel.forceLayout();
}
});
@ -308,9 +308,9 @@ public class AccountingPeriodPanel extends SimpleContainer {
Date currentYear = new Date();
String currentYearS = dtfYear.format(currentYear);
int yearLast3 = Integer.parseInt(currentYearS) - 3;
Date last3Year = dtfYearMonthDay.parse(yearLast3 + "-01-01");
Date last3Year = dtfShort.parse(yearLast3 + "-01-01");
startDate.setValue(last3Year);
Date endOfYear = dtfYearMonthDay.parse(currentYearS + "-12-31");
Date endOfYear = dtfShort.parse(currentYearS + "-12-31");
endDate.setValue(endOfYear);
break;
default:

6
src/main/resources/org/gcube/portlets/admin/accountingmanager/accountingman.gwt.xml
View File

@ -48,7 +48,7 @@
name="locale" values="es" /> <set-property name="locale" value="en, it, es"
/> <set-property-fallback name="locale" value="en" /> -->
<!--
<!--
<set-property name="log_ConsoleLogger" value="ENABLED" />
<set-property name="log_DivLogger" value="ENABLED" />
<set-property name="log_GWTLogger" value="ENABLED" />
@ -56,11 +56,11 @@
<!-- Not in GWT 2.6 <set-property name="log_FirebugLogger" value="ENABLED"
/> -->
<set-property name="log_ConsoleLogger" value="DISABLED" />
<set-property name="log_DivLogger" value="DISABLED" />
<set-property name="log_GWTLogger" value="DISABLED" />
<set-property name="log_SystemLogger" value="DISABLED" />
<set-property name="log_SystemLogger" value="DISABLED" />
<!-- Not in GWT 2.6 <set-property name="log_FirebugLogger" value="DISABLED"
/> -->