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

[Bug #1031] Style improvements in assigned resources popup

Browse source 
FEA: ItEr74S04BugFixing
This commit is contained in:
Lorenzo Tilve Álvaro 2011-04-29 10:37:05 +02:00
parent 5c137e6c3e
commit 52e71cc74b
3 changed files with 39 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java
View file

@ -318,7 +318,7 @@ public abstract class AllocationRow {
private void initializeResourcesPerDayInput() {
intendedResourcesPerDayInput
.setConstraint(CONSTRAINT_FOR_RESOURCES_PER_DAY);
intendedResourcesPerDayInput.setWidth("80px");
intendedResourcesPerDayInput.setSclass("assigned-resources-input");
Util.bind(intendedResourcesPerDayInput, new Util.Getter<BigDecimal>() {
@Override
@ -339,7 +339,7 @@ public abstract class AllocationRow {
private void initialize() {
initializeResourcesPerDayInput();
effortInput.setWidth("80px");
effortInput.setSclass("assigned-hours-input");
effortInput.setConstraint(constraintForHoursInput());
loadEffort();
}
@ -365,9 +365,12 @@ public abstract class AllocationRow {
private void onDifferentRealResourcesPerDay(
ResourcesPerDay realResourcesPerDay) {
this.realResourcesPerDay.setSclass("assigned-resources-label");
this.realResourcesPerDay
.setTooltiptext(_("It can't allocate the intended resources per day"));
this.realResourcesPerDay.setValue(_("(achieved: {0})",
.setTooltiptext(_(
"Only {0} resources per day were achieved for current allocation",
realResourcesPerDay.getAmount().toPlainString()));
this.realResourcesPerDay.setValue(_("[{0}]",
realResourcesPerDay.getAmount().toPlainString()));
}

22
navalplanner-webapp/src/main/webapp/common/css/navalplan_zk.css
View file

@ -1609,3 +1609,25 @@ input.z-datebox-text-disd {
.z-button-clk .z-button-cr {
background-position:-21px 0;
}
.assigned-hours-input {
width: 60px
}
.assigned-resources-input {
width:40px;
float: left;
margin-left: 20px;
}
.assigned-resources-label {
cursor: default;
}
.assignedresources .details div.z-column-cnt {
font-weight: normal;
}
.assignedresources .z-auxheader-cnt {
font-weight: bold;
}

20
navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul
View file

@ -80,19 +80,19 @@
<auxheader label="${i18n:_('Name')}" colspan="1" align="center"/>
<auxheader label="${i18n:_('Hours')}" colspan="@{allocationController.colspanHours}" align="center"/>
<auxheader label="${i18n:_('Resources Per Day')}" colspan="@{allocationController.colspanResources}" align="center"/>
<auxheader label="${i18n:_('Operations')}" colspan="1" align="center"/>
<auxheader label="${i18n:_('Op.')}" colspan="1" align="center"/>
</auxhead>
<columns sclass="details">
<column width="30px"/>
<column width="20px"/>
<column />
<column label="${i18n:_('Original')}" align="center" visible="@{allocationController.extendedView}" width="80px"/>
<column label="${i18n:_('Total')}" align="center" visible="@{allocationController.extendedView}" width="80px"/>
<column label="${i18n:_('Consolidated')}" align="center" visible="@{allocationController.extendedView}" width="80px"/>
<column label="${i18n:_('Non Consolidated')}" align="center"/>
<column label="${i18n:_('Total')}" align="center" visible="@{allocationController.extendedView}" width="80px"/>
<column label="${i18n:_('Consolidated')}" align="center" visible="@{allocationController.extendedView}" width="80px"/>
<column label="${i18n:_('Non Consolidated')}" align="center"/>
<column label="" align="center" width="80px"/>
<column label="${i18n:_('Original')}" align="center" visible="@{allocationController.extendedView}" width="70px"/>
<column label="${i18n:_('Total')}" align="center" visible="@{allocationController.extendedView}" width="70px"/>
<column label="${i18n:_('Consolidated')}" align="center" visible="@{allocationController.extendedView}" width="70px"/>
<column label="${i18n:_('Non Consolidated')}" align="center" width="120px"/>
<column label="${i18n:_('Total')}" align="center" visible="@{allocationController.extendedView}" width="70px"/>
<column label="${i18n:_('Consolidated')}" align="center" visible="@{allocationController.extendedView}" width="70px"/>
<column label="${i18n:_('Non Consolidated')}" align="center" width="120px"/>
<column label="" align="center" width="40px"/>
</columns>
</grid>
</groupbox>