[Vtigercrm-commits] [vtiger-commits] r9316 - in /vtigercrm/trunk/Smarty/templates: Header.tpl QuickCreate.tpl QuickCreateHidden.tpl

[vtigercrm-commits at vtiger.fosslabs.com]

Author: saraj
Date: Wed Sep  6 04:40:13 2006
New Revision: 9316

Log:
changes made to integrate enddate and time in event quickcreate form --Minnie

Modified:
    vtigercrm/trunk/Smarty/templates/Header.tpl
    vtigercrm/trunk/Smarty/templates/QuickCreate.tpl
    vtigercrm/trunk/Smarty/templates/QuickCreateHidden.tpl

Modified: vtigercrm/trunk/Smarty/templates/Header.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Header.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Header.tpl Wed Sep  6 04:40:13 2006
@@ -210,6 +210,7 @@
 						$("qcform").style.display="inline";
 					        $("qcform").innerHTML = response.responseText;
 						eval($("date_calpopup").innerHTML);
+						eval($("date_calpopup23").innerHTML);
 						eval($("qcform"));
                                         {rdelim}
                 {rdelim}

Modified: vtigercrm/trunk/Smarty/templates/QuickCreate.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/QuickCreate.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/QuickCreate.tpl Wed Sep  6 04:40:13 2006
@@ -217,7 +217,13 @@
                                                                 {/if}
                                                         {/if}
 							{elseif $uitype eq 23 || $uitype eq 5 || $uitype eq 6}
-							<td width="20%" class="cellLabel" align=right>{$fldlabel}</td>
+							<td width="20%" class="cellLabel" align=right>
+							{if $uitype eq 23 && $QCMODULE eq 'Event'}
+                                                                {$APP.LBL_EVENT_ENDDATE}
+                                                        {else}
+                                                                {$fldlabel}
+                                                        {/if}
+                                                        </td>
 							<td width="30%" align=left class="cellText">
 							   {foreach key=date_value item=time_value from=$fldvalue}
 								{assign var=date_val value="$date_value"}
@@ -228,6 +234,12 @@
 							{if $uitype eq 6}
 							   <input name="time_start" style="border:1px solid #bababa;" size="5" maxlength="5" type="text" value="{$time_val}">
 							{/if}
+							{if $uitype eq 23 && $QCMODULE eq 'Event'}
+                                                           <input name="time_end" style="border:1px solid #bababa;" size="5" maxlength="5" type="text" value="{$time_val}">
+                                                            <script id="date_calpopup23">
+                                                                getCalendarPopup('jscal_trigger_{$fldname}','jscal_field_{$fldname}','{$dateFormat}');
+                                                             </script>
+                                                        {/if}
 							{foreach key=date_format item=date_str from=$secondvalue}
                                                                 {assign var=dateFormat value="$date_format"}
 							        {assign var=dateStr value="$date_str"}
@@ -378,10 +390,18 @@
 </td>
 </tr>
 </table>
+{if $QCMODULE eq 'Event'}
+<SCRIPT id="qcvalidate">
+        var qcfieldname = new Array('subject','date_start','eventstatus','activitytype','due_date','time_end');
+        var qcfieldlabel = new Array('Subject','Start Date & Time','Status','Activity Type','End Date & Time','End Date & Time');
+        var qcfielddatatype = new Array('V~M','DT~M~time_start','V~O','V~O','D~M~OTH~GE~date_start~Start Date & Time','T~M');
+</SCRIPT>
+{else}
 <SCRIPT id="qcvalidate">
         var qcfieldname = new Array({$VALIDATION_DATA_FIELDNAME});
         var qcfieldlabel = new Array({$VALIDATION_DATA_FIELDLABEL});
         var qcfielddatatype = new Array({$VALIDATION_DATA_FIELDDATATYPE});
 </SCRIPT>
+{/if}
 </form>
 </body>

Modified: vtigercrm/trunk/Smarty/templates/QuickCreateHidden.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/QuickCreateHidden.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/QuickCreateHidden.tpl Wed Sep  6 04:40:13 2006
@@ -42,14 +42,12 @@
 	<input type="hidden" name="activity_mode" value="{$ACTIVITY_MODE}">
 	<input type="hidden" name="assigned_user_id" value="{$USERID}">
 	<input type="hidden" name="action" value="Save">
-	<input type="hidden" name="due_date" value="">
 {elseif $MODULE eq 'Events'}
         <input type="hidden" name="module" value="Calendar">
         <input type="hidden" name="record" value="">
         <input type="hidden" name="activity_mode" value="{$ACTIVITY_MODE}">
         <input type="hidden" name="assigned_user_id" value="{$USERID}">
         <input type="hidden" name="action" value="Save">
-        <input type="hidden" name="due_date" value="">
 {elseif $MODULE eq 'HelpDesk'}
 	<input type="hidden" name="module" value="{$MODULE}">
         <input type="hidden" name="return_module" value="HelpDesk">