diff --git a/app/global-translations/locale-en.json b/app/global-translations/locale-en.json index 04580808..d469789d 100755 --- a/app/global-translations/locale-en.json +++ b/app/global-translations/locale-en.json @@ -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", diff --git a/app/scripts/controllers/groups/EditMeetingController.js b/app/scripts/controllers/groups/EditMeetingController.js index a1c307e9..ab4a9297 100644 --- a/app/scripts/controllers/groups/EditMeetingController.js +++ b/app/scripts/controllers/groups/EditMeetingController.js @@ -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) { diff --git a/app/views/groups/editmeeting.html b/app/views/groups/editmeeting.html index 1937b59c..fa641017 100644 --- a/app/views/groups/editmeeting.html +++ b/app/views/groups/editmeeting.html @@ -9,36 +9,27 @@