RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Some small bugs are fixed

Browse source
This commit is contained in:
Misha 2015-11-30 14:44:45 +02:00
parent 57b01d4431
commit eb15d7f49c
6 changed files with 23 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libreplan-business/src/main/java/org/libreplan/business/logs/entities/RiskLog.java
View file

@ -48,7 +48,11 @@ public class RiskLog extends ProjectLog {
private RiskScoreStatesEnum score = RiskScoreStatesEnum.getDefault(); private RiskScoreStatesEnum score = RiskScoreStatesEnum.getDefault();
public static RiskLog create() { public static RiskLog create() {
return create(new RiskLog()); return create(new RiskLog(new Date()));
}
private RiskLog(Date date) {
this.dateCreated = date;
} }
/** /**

9
libreplan-webapp/src/main/java/org/libreplan/web/logs/IssueLogCRUDController.java
View file

@ -77,6 +77,7 @@ public class IssueLogCRUDController extends BaseCRUDController<IssueLog> {
showListWindow(); showListWindow();
initializeOrderComponent(); initializeOrderComponent();
initializeUserComponent(); initializeUserComponent();
bdProjectIssueLog.setDisabled(!LogsController.getProjectNameVisibility());
} }
@ -376,10 +377,12 @@ public class IssueLogCRUDController extends BaseCRUDController<IssueLog> {
} }
public Order getOrder() { public Order getOrder() {
if (LogsController.getProjectNameVisibility() == false) if (LogsController.getProjectNameVisibility() == false){
return LogsController.getOrder(); this.getIssueLog().setOrder(LogsController.getOrder());
return getIssueLog().getOrder();
}
else else
return issueLogModel.getIssueLog().getOrder(); return getIssueLog().getOrder();
} }
@Override @Override

2
libreplan-webapp/src/main/webapp/logs/_listIssueLog.zul
View file

@ -29,7 +29,7 @@
<column label="${i18n:_('Priority')}" sort="auto(lower(priority))"/> <column label="${i18n:_('Priority')}" sort="auto(lower(priority))"/>
<column label="${i18n:_('Severity')}" sort="auto(lower(severity))"/> <column label="${i18n:_('Severity')}" sort="auto(lower(severity))"/>
<column label="${i18n:_('Date raised')}" sort="auto(lower(dateRaised))"/> <column label="${i18n:_('Date raised')}" sort="auto(lower(dateRaised))"/>
<column label="${i18n:_('Created By')}" sort="auto(lower(createdBy))" hflex="min" /> <column label="${i18n:_('Created By')}" sort="auto(lower(createdBy.loginName))" hflex="min" />
<column label="${i18n:_('Assigned To')}" sort="auto(lower(assignedTo))"/> <column label="${i18n:_('Assigned To')}" sort="auto(lower(assignedTo))"/>
<column label="${i18n:_('Deadline')}" sort="auto(lower(deadline))"/> <column label="${i18n:_('Deadline')}" sort="auto(lower(deadline))"/>
<column label="${i18n:_('Date Resolved')}" sort="auto(lower(dateResolved))"/> <column label="${i18n:_('Date Resolved')}" sort="auto(lower(dateResolved))"/>

14
libreplan-webapp/src/main/webapp/logs/_listRiskLog.zul
View file

@ -25,17 +25,17 @@
<column label="${i18n:_('Projectname')}" visible="@{logsController.projectNameVisibility}" sort="auto(lower(order))" /> <column label="${i18n:_('Projectname')}" visible="@{logsController.projectNameVisibility}" sort="auto(lower(order))" />
<column label="${i18n:_('Probability')}" sort="auto(lower(probability))"/> <column label="${i18n:_('Probability')}" sort="auto(lower(probability))"/>
<column label="${i18n:_('Impact')}" sort="auto(lower(impact))"/> <column label="${i18n:_('Impact')}" sort="auto(lower(impact))"/>
<column label="${i18n:_('Risk score')}" sort="auto"/> <column label="${i18n:_('Risk score')}" sort="auto(lower(riskScore))"/>
<column label="${i18n:_('Status')}" sort="auto(lower(status))"/> <column label="${i18n:_('Status')}" sort="auto(lower(status))"/>
<column label="${i18n:_('Description')}" sort="auto(lower(code))"/> <column label="${i18n:_('Description')}" sort="auto(lower(code))"/>
<column label="${i18n:_('Date created')}" sclass="date" hflex="min" sort="auto(lower(dateCreated))"/> <column label="${i18n:_('Date created')}" sclass="date" hflex="min" sort="auto(lower(dateCreated))"/>
<column label="${i18n:_('CreatedBy')}" sort="auto(lower(createdBy))"/> <column label="${i18n:_('CreatedBy')}" sort="auto(createdBy.loginName)" />
<column label="${i18n:_('Counter measures')}" sort="auto(lower(counterMeasures))"/> <column label="${i18n:_('Counter measures')}" sort="auto(counterMeasures)"/>
<column label="${i18n:_('New risk score')}" sort="auto"/> <column label="${i18n:_('New risk score')}" sort="auto(scoreAfterCM)"/>
<column label="${i18n:_('Contingency')}" sort="auto"/> <column label="${i18n:_('Contingency')}" sort="auto(contingency)"/>
<column label="${i18n:_('Responsible')}" sort="auto"/> <column label="${i18n:_('Responsible')}" sort="auto(responsible)"/>
<column label="${i18n:_('ActionWhen')}" sclass="date" hflex="min" sort="auto(lower(actionWhen))"/> <column label="${i18n:_('ActionWhen')}" sclass="date" hflex="min" sort="auto(lower(actionWhen))"/>
<column label="${i18n:_('Notes')}" hflex="min" sort="auto"/> <column label="${i18n:_('Notes')}" hflex="min" sort="auto(notes)"/>
<column label="${i18n:_('Operations')}" sclass="operations" hflex="min"/> <column label="${i18n:_('Operations')}" sclass="operations" hflex="min"/>
</columns> </columns>
</grid> </grid>

6
libreplan-webapp/src/main/webapp/logs/_logs.zul
View file

@ -36,13 +36,13 @@
<window self="@{define(content)}" id="logWindow" apply="${logsController}" vflex="1"> <window self="@{define(content)}" id="logWindow" apply="${logsController}" vflex="1">
<borderlayout sclass="orderslayout" height="100%"> <borderlayout sclass="orderslayout" height="100%">
<center border="0" class="orderslayout-area"> <center border="0" sclass="orderslayout-area">
<tabbox id="tabboxLog"> <tabbox id="tabboxLog">
<tabs> <tabs>
<tab id="tabIssueLogs" label="${i18n:_('Issue logs')}" selected="true" <tab id="tabIssueLogs" label="${i18n:_('Issue logs')}" selected="true"
onSelect = "logsController.setupIssueLogController();"/> onClick = "logsController.setupIssueLogController();"/>
<tab id="tabRiskLogs" label="${i18n:_('Risk logs')}" <tab id="tabRiskLogs" label="${i18n:_('Risk logs')}"
onSelect = "logsController.setupRiskLogController();"/> onClick = "logsController.setupRiskLogController();"/>
</tabs> </tabs>
<tabpanels> <tabpanels>
<tabpanel sclass="orderelements-tab" id="tabpanelLog"> <tabpanel sclass="orderelements-tab" id="tabpanelLog">