Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
KPV-1045 :: Split edit deadlines and districts
- Loading branch information
iduetxe
committed
Sep 26, 2018
1 parent
2291af6
commit 5ee0aaf
Showing
16 changed files
with
172 additions
and
50 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
37 changes: 37 additions & 0 deletions
37
grails-app/views/participatoryBudget/districts/_deadlinesForm.gsp
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
|
|
||
| <formUtil:validateForm bean="${command}" form="districtParticipatoryBudgetForm" dirtyControl="true"/> | ||
| <form action="#" class="form-horizontal campaign-form" id="districtParticipatoryBudgetForm" method="POST" data-generalErrorMessage="${g.message(code:'kuorum.web.commands.payment.massMailing.DebateCommand.form.genericError')}"> | ||
| <input type="hidden" name="redirectLink" id="redirectLink"/> | ||
| <input type="hidden" name="sendType" value="${status== org.kuorum.rest.model.notification.campaign.CampaignStatusRSDTO.SENT?'SEND':'DRAFT'}" id="sendMassMailingType"/> | ||
| <input type="hidden" name="campaignId" value="${command.campaignId}"/> | ||
| <fieldset class="form-group"> | ||
| <label for="deadLineProposals" class="col-sm-2 col-md-1 control-label"><g:message code="kuorum.web.commands.payment.participatoryBudget.DistrictsCommand.deadLineProposals.label"/>:</label> | ||
| <div class="col-sm-4"> | ||
| <formUtil:date command="${command}" field="deadLineProposals"/> | ||
| </div> | ||
| </fieldset> | ||
| <fieldset class="form-group"> | ||
| <label for="deadLineTechnicalReview" class="col-sm-2 col-md-1 control-label"><g:message code="kuorum.web.commands.payment.participatoryBudget.DistrictsCommand.deadLineTechnicalReview.label"/>:</label> | ||
| <div class="col-sm-4"> | ||
| <formUtil:date command="${command}" field="deadLineTechnicalReview"/> | ||
| </div> | ||
| </fieldset> | ||
| <fieldset class="form-group"> | ||
| <label for="deadLineVotes" class="col-sm-2 col-md-1 control-label"><g:message code="kuorum.web.commands.payment.participatoryBudget.DistrictsCommand.deadLineVotes.label"/>:</label> | ||
| <div class="col-sm-4"> | ||
| <formUtil:date command="${command}" field="deadLineVotes"/> | ||
| </div> | ||
| </fieldset> | ||
| <fieldset class="form-group"> | ||
| <label for="deadLineResults" class="col-sm-2 col-md-1 control-label"><g:message code="kuorum.web.commands.payment.participatoryBudget.DistrictsCommand.deadLineResults.label"/>:</label> | ||
| <div class="col-sm-4"> | ||
| <formUtil:date command="${command}" field="deadLineResults"/> | ||
| </div> | ||
| </fieldset> | ||
|
|
||
| <g:render template="/campaigns/edit/stepButtons" model="[ | ||
| saveAndSentButtons:false, | ||
| mappings:mappings, | ||
| status:status, | ||
| command: command]"/> | ||
| </form> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| <html xmlns="http://www.w3.org/1999/html" xmlns="http://www.w3.org/1999/html"> | ||
| <head> | ||
| <g:set var="breadCrumbName">${campaign.name}</g:set> | ||
|
|
||
| <title>${breadCrumbName}</title> | ||
| <meta name="layout" content="paymentPlainLayout"> | ||
| <!-- Schema.org markup for Google+ --> | ||
| <r:require modules="datepicker, participatoryBudgetForm" /> | ||
| </head> | ||
|
|
||
| <content tag="mainContent"> | ||
| <ol class="breadcrumb"> | ||
| <li><g:link mapping="politicianCampaigns"><g:message code="head.logged.account.tools.massMailing"/></g:link></li> | ||
| <li><g:link mapping="politicianCampaignsNew"><g:message code="tools.campaign.new.title"/></g:link></li> | ||
| <li class="active">${breadCrumbName}</li> | ||
| </ol> | ||
|
|
||
| <div class="box-steps container-fluid campaign-steps"> | ||
| <g:set var="mappings" value="${ | ||
| [ | ||
| saveAndSentButtons:false, | ||
| step:'deadlines', | ||
| settings:'participatoryBudgetEditSettings', | ||
| content:'participatoryBudgetEditContent', | ||
| districts:'participatoryBudgetEditDistricts', | ||
| deadlines:'participatoryBudgetEditDeadlines', | ||
| showResult: 'campaignShow', | ||
| next: 'participatoryBudgetEditDistricts' | ||
| ]}"/> | ||
| <g:render template="/campaigns/steps/campaignSteps" model="[mappings: mappings]"/> | ||
| </div> | ||
|
|
||
| <div class="box-ppal campaign-new"> | ||
| <h1 class="sr-only"><g:message code="admin.createDebate.title"/></h1> | ||
|
|
||
| <g:render template="/participatoryBudget/districts/deadlinesForm" model="[ | ||
| command: command, | ||
| status:campaign.campaignStatusRSDTO, | ||
| campaign:campaign, | ||
| mappings:mappings]"/> | ||
| </div> | ||
|
|
||
| </content> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
21 changes: 21 additions & 0 deletions
21
...uorum/web/commands/payment/participatoryBudget/ParticipatoryBudgetDeadlinesCommand.groovy
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| package kuorum.web.commands.payment.participatoryBudget | ||
|
|
||
| import grails.validation.Validateable | ||
|
|
||
| @Validateable | ||
| class ParticipatoryBudgetDeadlinesCommand { | ||
| Long campaignId | ||
| Date deadLineProposals | ||
| Date deadLineTechnicalReview | ||
| Date deadLineVotes | ||
| Date deadLineResults | ||
|
|
||
| static constraints = { | ||
| campaignId nullable: false | ||
| deadLineProposals nullable: false | ||
| deadLineTechnicalReview nullable: false | ||
| deadLineVotes nullable: false | ||
| deadLineResults nullable: false | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters