[Fmsystem-commits] [16923] activitycalendar: validation

[sigurdne]

Revision: 16923
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16923
Author:   sigurdne
Date:     2017-07-07 06:43:13 -0400 (Fri, 07 Jul 2017)
Log Message:
-----------
activitycalendar: validation

Modified Paths:
--------------
    trunk/activitycalendar/js/activitycalendar/activities.edit.js
    trunk/activitycalendar/setup/phpgw_no.lang
    trunk/activitycalendar/templates/base/activity.xsl

Modified: trunk/activitycalendar/js/activitycalendar/activities.edit.js
===================================================================
--- trunk/activitycalendar/js/activitycalendar/activities.edit.js       
2017-07-07 09:05:37 UTC (rev 16922)
+++ trunk/activitycalendar/js/activitycalendar/activities.edit.js       
2017-07-07 10:43:13 UTC (rev 16923)
@@ -61,4 +61,23 @@
 $(document).ready(function ()
 {
        get_available_groups();
+
+       $.formUtils.addValidator({
+               name: 'arena',
+               validatorFunction: function (value, $el, config, languaje, 
$form)
+               {
+                       //check_for_budget is defined in xsl-template
+                       var v = false;
+                       var internal_arena = $('#internal_arena_id').val();
+                       var arena = $('#arena_id').val();
+                       if ((internal_arena != "" || arena != ""))
+                       {
+                               v = true;
+                       }
+                       return v;
+               },
+               errorMessage: lang['select arena: internal or external'],
+               errorMessageKey: ''
+       });
+
 });
\ No newline at end of file

Modified: trunk/activitycalendar/setup/phpgw_no.lang
===================================================================
--- trunk/activitycalendar/setup/phpgw_no.lang  2017-07-07 09:05:37 UTC (rev 
16922)
+++ trunk/activitycalendar/setup/phpgw_no.lang  2017-07-07 10:43:13 UTC (rev 
16923)
@@ -441,3 +441,4 @@
 e-post activitycalendar        no      E-post
 list %1        activitycalendar        no      list %1
 select date    activitycalendar        no      Velg dato
+select arena: internal or external     activitycalendar        no      Arena 
(kommunal eller ekstern) må fylles ut!
\ No newline at end of file

Modified: trunk/activitycalendar/templates/base/activity.xsl
===================================================================
--- trunk/activitycalendar/templates/base/activity.xsl  2017-07-07 09:05:37 UTC 
(rev 16922)
+++ trunk/activitycalendar/templates/base/activity.xsl  2017-07-07 10:43:13 UTC 
(rev 16923)
@@ -109,11 +109,8 @@
                                                </label>
                                                <select id="internal_arena_id" 
name="internal_arena_id" onchange="javascript: check_internal();">
                                                        <xsl:attribute 
name="data-validation">
-                                                               
<xsl:text>required</xsl:text>
+                                                               
<xsl:text>arena</xsl:text>
                                                        </xsl:attribute>
-                                                       <xsl:attribute 
name="data-validation-error-msg">
-                                                               <xsl:value-of 
select="php:function('lang', 'Arena må fylles ut!')"/>
-                                                       </xsl:attribute>        
                                                
                                                        <xsl:apply-templates 
select="list_building_options/options"/>
                                                </select>                       
                                                                
                                        </div>
@@ -122,6 +119,9 @@
                                                        <xsl:value-of 
select="php:function('lang', 'external_arena')"/>
                                                </label>
                                                <select id="arena_id" 
name="arena_id" style="width: 300px;" onchange="javascript: check_external();">
+                                                       <xsl:attribute 
name="data-validation">
+                                                               
<xsl:text>arena</xsl:text>
+                                                       </xsl:attribute>
                                                        <xsl:apply-templates 
select="list_arena_external_options/options"/>
                                                </select>                       
                                                                
                                        </div>
@@ -254,6 +254,8 @@
                </form>
        </div>
        <script type="text/javascript">
+               var lang = <xsl:value-of select="php:function('js_lang', 
'select arena: internal or external')"/>;
+
                $("[name='target[]']:eq(0)")
                .valAttr('','validate_checkbox_group')
                .valAttr('qty','min1')