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

Add the description field to the Create new project dialog

Browse source 
Improve workflow and communication by being able to see the description of newly created
projects without requiring access to edit the project.
This commit is contained in:
lmann99 2017-01-08 01:25:15 -05:00
parent 8243aa6304
commit 89773995ea
4 changed files with 19 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java
View file

@ -436,7 +436,8 @@ public class OrderModel extends IntegrationEntityModel implements IOrderModel {
newOrder.setCustomer(getOrder().getCustomer()); newOrder.setCustomer(getOrder().getCustomer());
newOrder.setCalendar(getCalendar()); newOrder.setCalendar(getCalendar());
newOrder.setInitDate(getOrder().getInitDate()); newOrder.setInitDate(getOrder().getInitDate());
newOrder.setDescription(getOrder().getDescription());
if ( getOrder().getDeadline() != null ) { if ( getOrder().getDeadline() != null ) {
newOrder.setDeadline(getOrder().getDeadline()); newOrder.setDeadline(getOrder().getDeadline());
} }

2
libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java
View file

@ -80,6 +80,8 @@ public class ProjectDetailsController extends GenericForwardComposer<Component>
private Textbox txtName; private Textbox txtName;
private Textbox txtDescription;
private Datebox deadline; private Datebox deadline;
private Checkbox generateCode; private Checkbox generateCode;

21
libreplan-webapp/src/main/resources/i18n/keys.pot
View file

@ -1674,7 +1674,7 @@ msgstr ""
#: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:90 #: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:90
#: libreplan-webapp/src/main/webapp/common/configuration.zul:178 #: libreplan-webapp/src/main/webapp/common/configuration.zul:178
#: libreplan-webapp/src/main/webapp/orders/_edition.zul:140 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:140
#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:76 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:82
msgid "Calendar" msgid "Calendar"
msgstr "" msgstr ""
@ -3532,7 +3532,7 @@ msgstr ""
#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:98 #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:98
#: libreplan-webapp/src/main/webapp/profiles/_editProfile.zul:74 #: libreplan-webapp/src/main/webapp/profiles/_editProfile.zul:74
#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:132 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:132
#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:90 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:95
#: libreplan-webapp/src/main/webapp/unittypes/unitTypes.zul:43 #: libreplan-webapp/src/main/webapp/unittypes/unitTypes.zul:43
#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:137 #: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:137
#: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:135 #: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:135
@ -3725,7 +3725,7 @@ msgstr ""
#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:43 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:43
#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:65 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:65
#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:42 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:48
msgid "Template" msgid "Template"
msgstr "" msgstr ""
@ -4300,7 +4300,7 @@ msgstr ""
#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:30 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:30
#: libreplan-webapp/src/main/webapp/subcontract/customerCommunications.zul:56 #: libreplan-webapp/src/main/webapp/subcontract/customerCommunications.zul:56
#: libreplan-webapp/src/main/webapp/orders/_edition.zul:227 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:227
#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:69 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:75
#: libreplan-webapp/src/main/webapp/orders/_list.zul:32 #: libreplan-webapp/src/main/webapp/orders/_list.zul:32
msgid "Customer" msgid "Customer"
msgstr "" msgstr ""
@ -4447,7 +4447,7 @@ msgstr ""
#: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:35 #: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:35
#: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:41 #: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:41
#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:38 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:38
#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:52 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:58
msgid "cannot be empty" msgid "cannot be empty"
msgstr "" msgstr ""
@ -7209,7 +7209,7 @@ msgstr ""
#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:60 #: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:60
#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:45 #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:45
#: libreplan-webapp/src/main/webapp/orders/_edition.zul:90 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:90
#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:53 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:59
#: libreplan-webapp/src/main/webapp/unittypes/_editUnitType.zul:45 #: libreplan-webapp/src/main/webapp/unittypes/_editUnitType.zul:45
msgid "Generate code" msgid "Generate code"
msgstr "" msgstr ""
@ -7452,7 +7452,7 @@ msgstr ""
#: libreplan-webapp/src/main/webapp/planner/editTask.zul:81 #: libreplan-webapp/src/main/webapp/planner/editTask.zul:81
#: libreplan-webapp/src/main/webapp/planner/reassign.zul:48 #: libreplan-webapp/src/main/webapp/planner/reassign.zul:48
#: libreplan-webapp/src/main/webapp/common/layout/template.zul:102 #: libreplan-webapp/src/main/webapp/common/layout/template.zul:102
#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:88 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:94
#: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:133 #: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:133
msgid "Accept" msgid "Accept"
msgstr "" msgstr ""
@ -7590,7 +7590,7 @@ msgstr ""
#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:78 #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:78
#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:109 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:109
#: libreplan-webapp/src/main/webapp/orders/_edition.zul:85 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:85
#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:48 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:54
#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:26 #: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:26
#: libreplan-webapp/src/main/webapp/orders/_list.zul:29 #: libreplan-webapp/src/main/webapp/orders/_list.zul:29
#: libreplan-webapp/src/main/webapp/unittypes/_editUnitType.zul:37 #: libreplan-webapp/src/main/webapp/unittypes/_editUnitType.zul:37
@ -7767,6 +7767,7 @@ msgstr ""
#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:43 #: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:43
#: libreplan-webapp/src/main/webapp/orders/_edition.zul:100 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:100
#: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:59 #: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:59
#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:44
#: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:37 #: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:37
#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:49 #: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:49
#: libreplan-webapp/src/main/webapp/email/email_templates.zul:83 #: libreplan-webapp/src/main/webapp/email/email_templates.zul:83
@ -7896,7 +7897,7 @@ msgstr ""
#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:53 #: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:53
#: libreplan-webapp/src/main/webapp/orders/_edition.zul:129 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:129
#: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:45 #: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:45
#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:58 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:64
#: libreplan-webapp/src/main/webapp/orders/_list.zul:30 #: libreplan-webapp/src/main/webapp/orders/_list.zul:30
msgid "Starting date" msgid "Starting date"
msgstr "" msgstr ""
@ -8357,7 +8358,7 @@ msgstr ""
#: libreplan-webapp/src/main/webapp/subcontract/customerCommunications.zul:54 #: libreplan-webapp/src/main/webapp/subcontract/customerCommunications.zul:54
#: libreplan-webapp/src/main/webapp/orders/_edition.zul:134 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:134
#: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:52 #: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:52
#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:64 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:70
#: libreplan-webapp/src/main/webapp/orders/_list.zul:31 #: libreplan-webapp/src/main/webapp/orders/_list.zul:31
msgid "Deadline" msgid "Deadline"
msgstr "" msgstr ""

4
libreplan-webapp/src/main/webapp/orders/_projectDetails.zul
View file

@ -39,6 +39,10 @@
<textbox id="txtName" value="@{projectController.order.name}" width="500px" <textbox id="txtName" value="@{projectController.order.name}" width="500px"
constraint="no empty:${i18n:_('cannot be empty')}" constraint="no empty:${i18n:_('cannot be empty')}"
onOK="projectController.accept();"/> onOK="projectController.accept();"/>
</row>
<row>
<label value="${i18n:_('Description')}" />
<textbox id="txtDescription" value="@{projectController.order.description}" width="500px" rows="7"/>
</row> </row>
<row> <row>
<label value="${i18n:_('Template')}" /> <label value="${i18n:_('Template')}" />