Option to change center meeting frequency and intervals

This commit is contained in:
Nayan 2014-12-04 14:57:38 +05:30
parent dad612af3e
commit c776d920e4
3 changed files with 21 additions and 17 deletions

View File

@ -255,6 +255,7 @@
"error.msg.calendar.loan.actual.disbursement.date.not.valid.recurring.date": "Actual disbursement date `{{params[0].value}}` does not fall on a meeting date.",
"error.msg.calendar.collectionsheet.not.valid.recurring.date":"Selected calendar date is not a valid recurrence date",
"validation.msg.loan.calendarId.not.greater.than.zero": "Meeting Calendar is mandatory.",
"warning.msg.calendar.update.note":"NOTE: If, this calender is synced with any active entities like JLG loans, RD accounts etc, then system will not allow you to change the calendar frequency and intervals.",
"validation.msg.collectionsheet.groupId.not.greater.than.zero": "Group is mandatory to generate collection sheet.",
"validation.msg.collectionsheet.dueDate.cannot.be.blank": "Date of transaction is mandatory to generate collection sheet.",
"validation.msg.collectionsheet.transactionDate.cannot.be.blank": "To generate collection sheet `transaction date` cannot be blank",
@ -563,6 +564,7 @@
"label.heading.addmember": "Add Member",
"label.heading.addrole": "Add Role",
"label.heading.repeatdetails": "Repeat Details",
"label.heading.meetingdetails": "Meeting Details",
"label.heading.creategroup": "Create Group",
"label.heading.editgroup": "Edit Group",
"label.heading.managemembers": "Manage Members",
@ -595,6 +597,7 @@
"#Inputs": "..",
"label.input.role": "Role",
"label.input.meetingstartdate": "Meeting start date",
"label.input.calendar.changes.effective.from":"above changes are effective from ",
"label.input.meetingdate": "Meeting date",
"label.input.repeats": "Repeats",
"label.input.repeatsevery": "Repeats every",

View File

@ -74,6 +74,7 @@
this.formData.startDate = reqDate;
this.formData.title = scope.calendarData.title;
this.formData.locale = "en";
this.formData.repeating = true;
this.formData.dateFormat = scope.df;
this.formData.typeId = "1";
if (this.formData.interval < 0) {

View File

@ -9,36 +9,27 @@
<form ng-submit="submit()" class="well form-horizontal">
<fieldset>
<legend>{{'label.heading.editmeeting' | translate}}</legend>
<div class="form-group">
<label class="control-label col-sm-2">{{'label.input.meetingstartdate' | translate}}<span
class="required">*</span></label>
<div class="col-sm-3">
<input id="startDate" type="text" datepicker-pop="dd MMMM yyyy" ng-model="first.date"
is-open="opened" min="'2000-01-01'" max="restrictDate" class="form-control"/>
</div>
</div>
<div class="form-group">
<label class="control-label col-sm-2">{{'label.input.repeat' | translate}}</label>
<div class="col-sm-3">
<input type="checkbox" ng-model="formData.repeating">
</div>
<div class="form-group">
<alert type="danger" >{{'warning.msg.calendar.update.note' | translate}} </alert>
</div>
<div class="form-group" ng-show="formData.repeating">
<label class="control-label col-sm-2">{{'label.heading.repeatdetails'
<label class="control-label col-sm-2">{{'label.heading.meetingdetails'
| translate}}</label>
<div class="col-sm-10">
<label class="control-label col-md-1">{{'label.input.repeats' | translate}}</label>
<div class="col-sm-3">
<select class="input-sm form-control" ng-model="formData.frequency"
ng-options="repeatsOption.id as repeatsOption.value for repeatsOption in repeatsOptions"
ng-change="selectedPeriod(formData.frequency)" value="{{repeatsOption.id}}"
ng-disabled=true></select>
ng-change="selectedPeriod(formData.frequency)" value="{{repeatsOption.id}}"></select>
</div>
<label class="control-label col-md-2">{{'label.input.repeatsevery' | translate}}</label>
<div class="col-sm-3">
<select class="input-sm form-control" ng-model="formData.interval"
ng-options="repeatsEveryOption for repeatsEveryOption in repeatsEveryOptions"
ng-disabled=true value="{{repeatsEveryOption}}"></select>
value="{{repeatsEveryOption}}"></select>
</div>
<label class="control-label col-md-1">{{periodValue}}</label>
</div>
@ -50,6 +41,15 @@
{{repeatsOnOption.name}} <br/>
</div>
</div>
</div>
<br>
<div class="form-group">
<label class="control-label col-sm-4">{{'label.input.calendar.changes.effective.from' | translate}}<span
class="required">*</span></label>
<div class="col-sm-3">
<input id="startDate" type="text" datepicker-pop="dd MMMM yyyy" ng-model="first.date"
is-open="opened" min="'2000-01-01'" max="restrictDate" class="form-control"/>
</div>
</div>
<div class="col-md-offset-2">
<a id="cancel" ng-show="entityType=='groups'" class="btn btn-default" href="#/viewgroup/{{groupOrCenterId}}">{{'label.button.cancel'