From c828f12af427ecdc7bcc63734d90d1d1df23760c Mon Sep 17 00:00:00 2001
From: unknown <priyanka.karan26@gmail.com>
Date: Fri, 5 Sep 2014 15:53:57 +0100
Subject: [PATCH] Ajax validation where ocurrences should not be more than 30,
 help text for help icons

---
 CRM/Core/BAO/RecurringEntity.php              |  3 ++
 templates/CRM/Core/Form/RecurringEntity.tpl   |  7 ++-
 .../CRM/Event/Form/ManageEvent/Repeat.hlp     | 45 +++++++++++++++----
 3 files changed, 42 insertions(+), 13 deletions(-)

diff --git a/CRM/Core/BAO/RecurringEntity.php b/CRM/Core/BAO/RecurringEntity.php
index 5703dc98f6..bdfae9f077 100644
--- a/CRM/Core/BAO/RecurringEntity.php
+++ b/CRM/Core/BAO/RecurringEntity.php
@@ -361,6 +361,9 @@ class CRM_Core_BAO_RecurringEntity extends CRM_Core_DAO_RecurringEntity {
 
         //Ends
         if($scheduleReminderDetails['start_action_offset']){
+          if($scheduleReminderDetails['start_action_offset'] > 30){
+            $r->errors[] = 'Occurrences should be less than or equal to 30';
+          }
           $r->count($scheduleReminderDetails['start_action_offset']);
         }
 
diff --git a/templates/CRM/Core/Form/RecurringEntity.tpl b/templates/CRM/Core/Form/RecurringEntity.tpl
index e15adae26c..4b38d67fbd 100644
--- a/templates/CRM/Core/Form/RecurringEntity.tpl
+++ b/templates/CRM/Core/Form/RecurringEntity.tpl
@@ -64,7 +64,7 @@
           </tr>*}
           <tr class="crm-core-form-recurringentity-block-ends">
             <td class="label">{$form.ends.label}</td>
-            <td>{$form.ends.1.html}&nbsp;{$form.start_action_offset.html}&nbsp;occurrences{help id="id-ends-after"}</td>
+            <td>{$form.ends.1.html}&nbsp;{$form.start_action_offset.html}&nbsp;occurrences&nbsp;{help id="id-ends-after"}</td>
           </tr>
           <tr class="crm-core-form-recurringentity-block-absolute_date">
               <td class="label"></td>
@@ -88,9 +88,9 @@
       </div>
     </div>
 </div>
-<div id="dialog" style="display:none">
+<!--<div id="dialog" style="display:none">
     Changing Repeat configuration may affect all other connected repeating events, Are you sure?
-</div>
+</div>-->
 <div id="preview-dialog" style="display:none;height:auto;">
     <div style="display:block;" id="generated_dates"></div>
     
@@ -317,7 +317,6 @@
             }
             html += '</table>';
             if(errors.length > 0){
-                alert('hey');
                 html = '';
                 for (var j = 0; j < errors.length; j++) {
                     html += '<span style="color: #8A1F11;">*&nbsp;' + errors[j] + '</span><br/>';
diff --git a/templates/CRM/Event/Form/ManageEvent/Repeat.hlp b/templates/CRM/Event/Form/ManageEvent/Repeat.hlp
index 91f78d4688..3b7171e2ce 100644
--- a/templates/CRM/Event/Form/ManageEvent/Repeat.hlp
+++ b/templates/CRM/Event/Form/ManageEvent/Repeat.hlp
@@ -28,54 +28,81 @@
 {ts}Repeats{/ts}
 {/htxt}
 {htxt id="id-repeats"}
-  {ts}{/ts}
+  {ts}Access the drop-down menu here to select how frequently your event occurs. You have several options:
+    <ul>
+        <li>Hourly:&nbsp;&nbsp;your event repeats hourly or after every few hours</li>
+        <li>Daily:&nbsp;&nbsp;your event repeats daily or after every few days</li>
+        <li>Weekly:&nbsp;&nbsp;your event repeats on one or more days every week</li>
+        <li>Monthly:&nbsp;&nbsp;your event repeats on one or more days every month</li>
+        <li>Yearly:&nbsp;&nbsp;your event repeats yearly or after every few years</li> 
+    </ul>
+    For eg - You would select option "monthly", if your event occurs every month.
+  {/ts}
 {/htxt}
 
 {htxt id="id-repeats-every-title"}
 {ts}Repeats every{/ts}
 {/htxt}
 {htxt id="id-repeats-every"}
-  {ts}This option defines the interval.{/ts}
+  {ts}Option you select here decides the repetition interval.<br/>
+      For eg - If your event repeats every 5 months, then you would select option 5.{/ts}
 {/htxt}
 
 {htxt id="id-repeats-on-title"}
 {ts}Repeats on{/ts}
 {/htxt}
 {htxt id="id-repeats-on"}
-  {ts}{/ts}
+  {ts}
+    You can choose to select your event to repeat on weekdays, weekends or any combination of day of the week.<br/>
+    For eg - You can select Monday, Wednesday and Friday for your event to occur on alternate weekdays.
+  {/ts}
 {/htxt}
 
 {htxt id="id-repeats-by-month-title"}
 {ts}Repeats by day of the month{/ts}
 {/htxt}
 {htxt id="id-repeats-by-month"}
-  {ts}{/ts}
+  {ts}
+    Options given here are days of a month from 1 - 31<br/>
+    For eg - If your event repeats 8th of every month then you would select 8.
+  {/ts}
 {/htxt}
 
 {htxt id="id-repeats-by-week-title"}
 {ts}Repeats by day of the week{/ts}
 {/htxt}
 {htxt id="id-repeats-by-week"}
-  {ts}{/ts}
+    {ts}
+        You can choose to select event occurring every third Friday, last Monday, fourth Wednesday of the month and various other combinations given in the dropdown.
+    {/ts}
 {/htxt}
 
 {htxt id="id-ends-after-title"}
 {ts}Ends{/ts}
 {/htxt}
 {htxt id="id-ends-after"}
-  {ts}{/ts}
+  {ts}
+    Use this field to limit/end the repetition of the event.<br/>
+    For eg - You want to repeat an event which is now a six month course(i.e it repeats 6 times), then you give 6 as a value to this field.
+  {/ts}
 {/htxt}
 
 {htxt id="id-ends-on-title"}
 {ts}Ends{/ts}
 {/htxt}
 {htxt id="id-ends-on"}
-  {ts}{/ts}
+    {ts}
+        Choose a specific date here to limit/end the repetition<br/>
+        For eg - Your event ends on 26th of September 2014
+    {/ts}
 {/htxt}
 
 {htxt id="id-exclude-date-title"}
-{ts}Exclude Date{/ts}
+{ts}Exclude Date(s){/ts}
 {/htxt}
 {htxt id="id-exclude-date"}
-  {ts}Dates added here would be ignored for repeating events{/ts}
+    {ts}
+        Add dates here, if you don't want to repeat your event on those dates.<br/>
+        This field enables you to alter certain session, skip a holiday in the middle of a term or a public holiday on which you are close.
+    {/ts}
 {/htxt}
\ No newline at end of file
-- 
2.25.1