fmsystem-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Fmsystem-commits] [14306] fixing forms


From: Saul
Subject: [Fmsystem-commits] [14306] fixing forms
Date: Tue, 10 Nov 2015 00:03:55 +0000

Revision: 14306
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14306
Author:   psaul
Date:     2015-11-10 00:03:53 +0000 (Tue, 10 Nov 2015)
Log Message:
-----------
fixing forms

Modified Paths:
--------------
    branches/dev-syncromind/bookingfrontend/inc/class.uibooking.inc.php
    branches/dev-syncromind/bookingfrontend/templates/base/application_edit.xsl
    branches/dev-syncromind/bookingfrontend/templates/base/application_new.xsl
    branches/dev-syncromind/bookingfrontend/templates/base/booking_cancel.xsl

Modified: branches/dev-syncromind/bookingfrontend/inc/class.uibooking.inc.php
===================================================================
--- branches/dev-syncromind/bookingfrontend/inc/class.uibooking.inc.php 
2015-11-09 16:04:58 UTC (rev 14305)
+++ branches/dev-syncromind/bookingfrontend/inc/class.uibooking.inc.php 
2015-11-10 00:03:53 UTC (rev 14306)
@@ -460,6 +460,13 @@
             $booking['to_'] = pretty_timestamp($booking['to_']);
             $booking['repeat_until'] = 
pretty_timestamp($booking['repeat_until']);
             
+            foreach($bookings['results'] as &$b)
+                       {
+                               $b['from_'] = pretty_timestamp($b['from_']);
+                               $b['to_'] = pretty_timestamp($b['to_']);
+                $b['repeat_until'] = pretty_timestamp($b['repeat_until']);
+                       }
+
             $activity_path = 
$this->activity_bo->get_path($booking['activity_id']);
             $top_level_activity = $activity_path ? $activity_path[0]['id'] : 
-1;
             
@@ -479,7 +486,6 @@
             $GLOBALS['phpgw']->jqcal->add_listener('field_to', 'datetime');
             
             $GLOBALS['phpgw']->jqcal->add_listener('field_repeat_until', 
'date');
-            
                        if ($step < 2) 
                        {
                                self::render_template('booking_edit', 
array('booking' => $booking, 
@@ -503,7 +509,7 @@
                                        'groups' => $groups,
                                        'activities' => $activities,
                                        'step' => $step,
-                                       'repeat_until' => 
$_POST['repeat_until'],
+                                       'repeat_until' => 
pretty_timestamp($_POST['repeat_until']),
                                        'recurring' => $_POST['recurring'],
                                        'outseason' => $_POST['outseason'],
                                        'group_id' => $_POST['group_id'],
@@ -602,7 +608,8 @@
                        $activities = $activities['results'];
             
             self::add_javascript('bookingfrontend', 'bookingfrontend', 
'booking_massupdate.js');
-                       
+                       echo "Step: " . $step . "<br />";
+            var_dump($booking);exit();
                        self::render_template('booking_massupdate',
                                        array('booking' => $booking,
                                                  'agegroups' => $agegroups,
@@ -755,6 +762,13 @@
                                        $this->redirect(array('menuaction' =>  
'bookingfrontend.uibuilding.schedule', 'id' => $system_message['building_id']));
 
                    }
+                
+                $booking['from_'] = pretty_timestamp($booking['from_']);
+                $booking['to_'] = pretty_timestamp($booking['to_']);
+                
+                $GLOBALS['phpgw']->jqcal->add_listener('field_repeat_until', 
'date');
+                $booking['resources_json'] = json_encode(array_map('intval', 
$booking['resources']));
+                
                    $this->flash_form_errors($errors);
                                $allocation['cancel_link'] = 
self::link(array('menuaction' => 'bookingfrontend.uibuilding.schedule', 'id' => 
$allocation['building_id']));
        

Modified: 
branches/dev-syncromind/bookingfrontend/templates/base/application_edit.xsl
===================================================================
--- branches/dev-syncromind/bookingfrontend/templates/base/application_edit.xsl 
2015-11-09 16:04:58 UTC (rev 14305)
+++ branches/dev-syncromind/bookingfrontend/templates/base/application_edit.xsl 
2015-11-10 00:03:53 UTC (rev 14306)
@@ -107,9 +107,9 @@
                                 <xsl:when test="position() > 1">
                                     <div class="date-container">
                                         <a href="javascript:void(0);" 
class="close-btn btnclose">-</a>
-                                        <dt><label 
for="start_date_{$index}"><xsl:value-of select="php:function('lang', 'From)" 
/></label></dt>
+                                        <dt><label 
for="start_date_{$index}"><xsl:value-of select="php:function('lang', 'From')" 
/></label></dt>
                                         <dd>
-                                            <input class="newaddedpicker 
datetime" id="start_date_{$index}" type="text" name="from[]">
+                                            <input class="newaddedpicker 
datetime" id="start_date_{$index}" type="text" name="from_[]">
                                                 <xsl:attribute name="value">
                                                     <xsl:value-of 
select="from_" />
                                                 </xsl:attribute>
@@ -117,7 +117,7 @@
                                         </dd>
                                         <dt><label 
for="end_date_{$index}"><xsl:value-of select="php:function('lang', 'To')" 
/></label></dt>
                                         <dd>
-                                            <input class="datepicker datetime" 
id="end_date_{$index}" type="text" name="to_[]">
+                                            <input class="newaddedpicker 
datetime" id="end_date_{$index}" type="text" name="to_[]">
                                                 <xsl:attribute name="value">
                                                     <xsl:value-of select="to_" 
/>
                                                 </xsl:attribute>
@@ -136,7 +136,7 @@
                                                 </xsl:attribute>
                                             </input>
                                         </dd>
-                                        <dt><label 
for="end_date"><xsl:value-of select="php:function('lang', To)" /></label></dt>
+                                        <dt><label 
for="end_date"><xsl:value-of select="php:function('lang', 'To')" /></label></dt>
                                         <dd>
                                             <input class="datetime" 
id="end_date" type="text" name="to_[]">
                                                 <xsl:attribute name="value">
@@ -149,7 +149,7 @@
                             </xsl:choose>
                         </xsl:for-each>
                     </div>
-                    <dt><a href="#" id="add-date-link"><xsl:value-of 
select="php:function('lang', 'Add another date')" /></a></dt>
+                    <dt><a href="javascript:void(0)" 
id="add-date-link"><xsl:value-of select="php:function('lang', 'Add another 
date')" /></a></dt>
                 </dl>
             </div>
             <div class="pure-u-1 pure-u-md-1-2 pure-u-lg-1-3">

Modified: 
branches/dev-syncromind/bookingfrontend/templates/base/application_new.xsl
===================================================================
--- branches/dev-syncromind/bookingfrontend/templates/base/application_new.xsl  
2015-11-09 16:04:58 UTC (rev 14305)
+++ branches/dev-syncromind/bookingfrontend/templates/base/application_new.xsl  
2015-11-10 00:03:53 UTC (rev 14306)
@@ -300,7 +300,7 @@
                                <xsl:attribute name="href"><xsl:value-of 
select="application/cancel_link"/></xsl:attribute>
                                <xsl:value-of select="php:function('lang', 
'Cancel')" />
                        </a>
-                       <p style="width: 750px; margin-top: 10px;">Trykker du 
<strong>SEND</strong>-knappen får du opp en rød melding øverst om noen 
opplysninger mangler, er alt OK kommer det opp en grønn melding. Det blir sendt 
en bekreftelse til din e-post, og en lenke hvor du kan gå inn og se status og 
legge til ekstra opplysninger i saken.<br /><br />
+                       <p style="margin-top: 10px;">Trykker du 
<strong>SEND</strong>-knappen får du opp en rød melding øverst om noen 
opplysninger mangler, er alt OK kommer det opp en grønn melding. Det blir sendt 
en bekreftelse til din e-post, og en lenke hvor du kan gå inn og se status og 
legge til ekstra opplysninger i saken.<br /><br />
                                Trykker du <strong>Avbryt</strong> blir 
søknaden ikke sendt eller lagret, og du går tilbake til kalenderen.</p>
                </div>
        </form>

Modified: 
branches/dev-syncromind/bookingfrontend/templates/base/booking_cancel.xsl
===================================================================
--- branches/dev-syncromind/bookingfrontend/templates/base/booking_cancel.xsl   
2015-11-09 16:04:58 UTC (rev 14305)
+++ branches/dev-syncromind/bookingfrontend/templates/base/booking_cancel.xsl   
2015-11-10 00:03:53 UTC (rev 14306)
@@ -10,7 +10,7 @@
        <dd><xsl:value-of select="php:function('lang', 'Booking Cancel 
Information')"/></dd>
        <dd><xsl:value-of select="php:function('lang', 'Booking Cancel 
Information2')"/></dd>
        </dl>
-    <div class="clr"/>
+    <!--div class="clr"/-->
     <form action="" method="POST">
                <input type="hidden" name="application_id" 
value="{booking/application_id}"/>
         <input type="hidden" name="group_id" value="{booking/group_id}" />
@@ -18,122 +18,161 @@
         <input type="hidden" name="season_id" value="{booking/season_id}" />
         <input type="hidden" name="from_" value="{booking/from_}" />
         <input type="hidden" name="to_" value="{booking/to_}" />
-
-        <dl class="form-col">
-            <dt><label for="field_building"><xsl:value-of 
select="php:function('lang', 'Building')" /></label></dt>
-            <dd>
-                <div>
-                        <xsl:value-of select="booking/building_name"/>
-                </div>
-            </dd>
-            <dt><label for="field_from"><xsl:value-of 
select="php:function('lang', 'From')" /></label></dt>
-            <dd>
-                <div>
-                    <xsl:value-of select="booking/from_"/>
-                </div>
-            </dd>
-            <dt><label for="field_to"><xsl:value-of 
select="php:function('lang', 'To')"/></label></dt>
-            <dd>
-                <div>
-                    <xsl:value-of select="booking/to_"/>
-                </div>
-            </dd>
-                       <dt><label for="field_repeat_until"><xsl:value-of 
select="php:function('lang', 'Recurring allocation cancelation')" 
/></label></dt>
-                       <dd>
-                               <label>
-                                       <input type="checkbox" name="outseason" 
id="outseason">
-                                               <xsl:if test="outseason='on'">
-                                                       <xsl:attribute 
name="checked">checked</xsl:attribute>
-                                               </xsl:if>
-                                       </input>
-                                       <xsl:value-of 
select="php:function('lang', 'Out season')" />
-                               </label>
-                       </dd>
-                       <dd>
-                               <label>
-                                       <input type="checkbox" name="recurring" 
id="recurring">
-                                               <xsl:if test="recurring='on'">
-                                                       <xsl:attribute 
name="checked">checked</xsl:attribute>
-                                               </xsl:if>
-                                       </input>
-                                       <xsl:value-of 
select="php:function('lang', 'Cancel until')" />
-                               </label>
-                       </dd>
-                       <dd class="date-picker">
-                               <input id="field_repeat_until" 
name="repeat_until" type="text">
-                                       <xsl:attribute 
name="value"><xsl:value-of select="repeat_until"/></xsl:attribute>
-                               </input>
-                       </dd>
-                       <dt><xsl:value-of select="php:function('lang', 
'Interval')" /></dt>
-                       <dd>
-                               <xsl:value-of select="../field_interval" />
-                               <select id="field_interval" 
name="field_interval">
-                                       <option value="1">
-                                               <xsl:if test="interval=1">
-                                                       <xsl:attribute 
name="selected">selected</xsl:attribute>
-                                               </xsl:if>
-                                               <xsl:value-of 
select="php:function('lang', '1 week')" />
-                                       </option>
-                                       <option value="2">
-                                               <xsl:if test="interval=2">
-                                                       <xsl:attribute 
name="selected">selected</xsl:attribute>
-                                               </xsl:if>
-                                               <xsl:value-of 
select="php:function('lang', '2 weeks')" />
-                                       </option>
-                                       <option value="3">
-                                               <xsl:if test="interval=3">
-                                                       <xsl:attribute 
name="selected">selected</xsl:attribute>
-                                               </xsl:if>
-                                               <xsl:value-of 
select="php:function('lang', '3 weeks')" />
-                                       </option>
-                                       <option value="4">
-                                               <xsl:if test="interval=4">
-                                                       <xsl:attribute 
name="selected">selected</xsl:attribute>
-                                               </xsl:if>
-                                               <xsl:value-of 
select="php:function('lang', '4 weeks')" />
-                                       </option>
-                               </select>
-                       </dd>
-        </dl>
-        <dl class="form-col">
-            <dt><label for="field_group"><xsl:value-of 
select="php:function('lang', 'Group')"/></label></dt>
-            <dd>
+        <div class="pure-g">
+            <div class="pure-u-1 pure-u-md-2-5 pure-u-lg-1-4">
+                <dl class="form-col">
+                    <dt><label for="field_building"><xsl:value-of 
select="php:function('lang', 'Building')" /></label></dt>
+                    <dd>
+                        <div>
+                            <xsl:value-of select="booking/building_name"/>
+                        </div>
+                    </dd>
+                </dl>
+            </div>
+            <div class="pure-u-1 pure-u-md-2-5 pure-u-lg-1-4">
+                <dl class="form-col">
+                    <dt><label for="field_group"><xsl:value-of 
select="php:function('lang', 'Group')"/></label></dt>
+                    <dd>
                         <xsl:value-of select="booking/group_name"/>
-            </dd>
-            <dt><label for="field_season"><xsl:value-of 
select="php:function('lang', 'Season')"/></label></dt>
-            <dd>
+                    </dd>
+                </dl>
+            </div>
+        </div>
+        <div class="pure-g">
+            <div class="pure-u-1 pure-u-md-2-5 pure-u-lg-1-4">
+                <dl class="form-col">
+                    <dt><label for="field_from"><xsl:value-of 
select="php:function('lang', 'From')" /></label></dt>
+                    <dd>
+                        <div>
+                            <xsl:value-of select="booking/from_"/>
+                        </div>
+                    </dd>
+                </dl>
+                <dl class="form-col">
+                    <dt><label for="field_to"><xsl:value-of 
select="php:function('lang', 'To')"/></label></dt>
+                    <dd>
+                        <div>
+                            <xsl:value-of select="booking/to_"/>
+                        </div>
+                    </dd>
+                </dl>
+            </div>
+            <div class="pure-u-1 pure-u-md-2-5 pure-u-lg-1-4">
+                <dl class="form-col">
+                    <dt><label for="field_season"><xsl:value-of 
select="php:function('lang', 'Season')"/></label></dt>
+                    <dd>
                         <xsl:value-of select="booking/season_name"/>
-            </dd>
-                       <dt><label for="field_repeat_until"><xsl:value-of 
select="php:function('lang', 'Cancel allocation also')" /></label></dt>
-                       <dd>
-                               <label>
-                                       <input type="checkbox" 
name="delete_booking" id="delete_booking">
-                                                       <xsl:attribute 
name="checked">checked</xsl:attribute>
-                                                       <xsl:attribute 
name="disabled">disabled</xsl:attribute>
-                                       </input>
-                                       <xsl:value-of 
select="php:function('lang', 'Cancel bookings')" />
-                               </label>
-                       </dd>
-                       <dd>
-                               <label>
-                                       <input type="checkbox" 
name="delete_allocation" id="delete_allocation">
-                                               <xsl:if 
test="delete_allocation='on'">
-                                                       <xsl:attribute 
name="checked">checked</xsl:attribute>
-                                               </xsl:if>
-                                       </input>
-                                       <xsl:value-of 
select="php:function('lang', 'Cancel allocations')" />
-                               </label>
-                       </dd>
-        </dl>
-               <div style='clear:left; padding:0; margin:0'/>
-
-        <dl class="form-col">
-               <dt><label for="field_message"><xsl:value-of 
select="php:function('lang', 'Message')" /></label></dt>
-               <dd class="yui-skin-sam">
-               <textarea id="field-message" name="message" 
type="text"><xsl:value-of select="system_message/message"/></textarea>
-               </dd>
-        </dl>
-
+                    </dd>
+                </dl>
+                <dl class="form-col">
+                    <dt><label for="field_repeat_until"><xsl:value-of 
select="php:function('lang', 'Cancel allocation also')" /></label></dt>
+                    <dd>
+                        <label>
+                            <input type="checkbox" name="delete_booking" 
id="delete_booking">
+                                <xsl:attribute 
name="checked">checked</xsl:attribute>
+                                <xsl:attribute 
name="disabled">disabled</xsl:attribute>
+                            </input>
+                            <xsl:value-of select="php:function('lang', 'Cancel 
bookings')" />
+                        </label>
+                    </dd>
+                </dl>
+                <dl class="form-col">
+                    <dd>
+                        <label>
+                            <input type="checkbox" name="delete_allocation" 
id="delete_allocation">
+                                <xsl:if test="delete_allocation='on'">
+                                    <xsl:attribute 
name="checked">checked</xsl:attribute>
+                                </xsl:if>
+                            </input>
+                            <xsl:value-of select="php:function('lang', 'Cancel 
allocations')" />
+                        </label>
+                    </dd>
+                </dl>
+            </div>
+        </div>
+        <div class="pure-g">
+            <div class="pure-u-1 pure-u-md-2-5 pure-u-lg-1-4">
+                <dl class="form-col">
+                    <dt><label for="field_repeat_until"><xsl:value-of 
select="php:function('lang', 'Recurring allocation cancelation')" 
/></label></dt>
+                    <dd>
+                        <label>
+                            <input type="checkbox" name="outseason" 
id="outseason">
+                                <xsl:if test="outseason='on'">
+                                    <xsl:attribute 
name="checked">checked</xsl:attribute>
+                                </xsl:if>
+                            </input>
+                            <xsl:value-of select="php:function('lang', 'Out 
season')" />
+                        </label>
+                    </dd>
+                    <dd>
+                        <label>
+                            <input type="checkbox" name="recurring" 
id="recurring">
+                                <xsl:if test="recurring='on'">
+                                    <xsl:attribute 
name="checked">checked</xsl:attribute>
+                                </xsl:if>
+                            </input>
+                            <xsl:value-of select="php:function('lang', 'Cancel 
until')" />
+                        </label>
+                    </dd>
+                    <dd>
+                        <input class="datetime" id="field_repeat_until" 
name="repeat_until" type="text">
+                            <xsl:attribute name="value"><xsl:value-of 
select="repeat_until" /></xsl:attribute>
+                        </input>
+                    </dd>
+                    <!--dd class="date-picker">
+                        <input id="field_repeat_until" name="repeat_until" 
type="text">
+                            <xsl:attribute name="value"><xsl:value-of 
select="repeat_until"/></xsl:attribute>
+                        </input>
+                    </dd-->
+                </dl>
+            </div>
+        </div>
+        <div class="pure-g">
+            <div class="pure-u-1 pure-u-md-2-5 pure-u-lg-1-4">
+                <dl class="form-col">
+                    <dt><xsl:value-of select="php:function('lang', 
'Interval')" /></dt>
+                    <dd>
+                        <xsl:value-of select="../field_interval" />
+                        <select id="field_interval" name="field_interval">
+                            <option value="1">
+                                <xsl:if test="interval=1">
+                                    <xsl:attribute 
name="selected">selected</xsl:attribute>
+                                </xsl:if>
+                                <xsl:value-of select="php:function('lang', '1 
week')" />
+                            </option>
+                            <option value="2">
+                                <xsl:if test="interval=2">
+                                    <xsl:attribute 
name="selected">selected</xsl:attribute>
+                                </xsl:if>
+                                <xsl:value-of select="php:function('lang', '2 
weeks')" />
+                            </option>
+                            <option value="3">
+                                <xsl:if test="interval=3">
+                                    <xsl:attribute 
name="selected">selected</xsl:attribute>
+                                </xsl:if>
+                                <xsl:value-of select="php:function('lang', '3 
weeks')" />
+                            </option>
+                            <option value="4">
+                                <xsl:if test="interval=4">
+                                    <xsl:attribute 
name="selected">selected</xsl:attribute>
+                                </xsl:if>
+                                <xsl:value-of select="php:function('lang', '4 
weeks')" />
+                            </option>
+                        </select>
+                    </dd>
+                </dl>
+            </div>
+        </div>
+        <div class="pure-g">
+            <div class="pure-u-1 pure-u-md-2-5 pure-u-lg-1-4">
+                <dl class="form-col">
+                    <dt><label for="field_message"><xsl:value-of 
select="php:function('lang', 'Message')" /></label></dt>
+                    <dd class="yui-skin-sam">
+                    <textarea id="field-message" name="message" 
type="text"><xsl:value-of select="system_message/message"/></textarea>
+                    </dd>
+                </dl>
+            </div>
+        </div>
         <div class="form-buttons">
             <input type="submit">
                                <xsl:attribute name="value"><xsl:value-of 
select="php:function('lang', 'Cancel booking')"/></xsl:attribute>
@@ -143,9 +182,34 @@
                 <xsl:value-of select="php:function('lang', 'Cancel')"/>
             </a>
         </div>
+        
+
+        <!--dl class="form-col">
+                    
+                    
+                    
+                    
+                    
+        </dl>
+        <dl class="form-col">
+            
+                    
+        </dl>
+               <div style='clear:left; padding:0; margin:0'/>
+
+        <dl class="form-col">
+                    
+        </dl-->
+
+        
     </form>
     </div>
     <script type="text/javascript">
+        var season_id = '<xsl:value-of select="booking/season_id" />';
+        var group_id = '<xsl:value-of select="booking/group_id" />';
+        var initialSelection = '<xsl:value-of select="booking/resource_json" 
/>';
+    </script>
+    <!--script type="text/javascript">
         YAHOO.booking.season_id = '<xsl:value-of select="booking/season_id"/>';
         YAHOO.booking.group_id = '<xsl:value-of select="booking/group_id"/>';
         <![CDATA[
@@ -170,5 +234,5 @@
         });
         descEdit.render();
         ]]>
-</script>
+    </script-->
 </xsl:template>




reply via email to

[Prev in Thread] Current Thread [Next in Thread]