Changeset 939 in genappalpha

Timestamp:

Jun 29, 2016, 6:00:05 AM (6 years ago)

Author:

ehb

Message:

html5: support for nested listbox repeaters

Files:

• etc/perl/genapp_util.pl (modified) (3 diffs)
• etc/reserved_words (modified) (1 diff)
• languages/html5/add/js/ga.min.js (modified) (1 diff)
• languages/html5/base.php (modified) (3 diffs)
• languages/html5/js/repeat.js (modified) (2 diffs)

etc/perl/genapp_util.pl

@@ -1207 +1207 @@
                 $error .= valid_name( "$f \"id\"", $x );
             }
+            # check for duplicate id's
+            {
+                my $ref_mod = {};
+                my $mod_info = start_json( $json, $ref_mod );
+                
+                my %ids;
+
+                do {
+                    if ( !$$mod_info{ 'fields:id' } ) {
+                        $error .= "Module $f has field without field id defined\n" if $$mod_info{ 'fields:type' } ne "info";
+                    } else {
+                        $error .= "Module $f has fields with duplicate id \"" . $$mod_info{ 'fields:id' } . "\"\n" if $ids{ $$mod_info{ 'fields:id' } }++;
+                    }
+                } while( $mod_info = next_json( $ref_mod, 'fields:id' ) );
+            }
             # check repeaters & repeats
             {
@@ -1264 +1279 @@
                             $error .= "Module $f field '$k' repeat on '$repeat{ $k }' : missing repeater\n";
                         }
-#                        if ( $repeater{ $k } && $repeater{ $repeat{ $k } } =~ /(integer)/ )
-#                        {
-#                            $warn .= "Module $f field '$k' is a repeat on '$repeat{ $k }' which is a repeater of type '$repeater{ $repeat{ $k } }'. This structure is not currently supported for integer repeat types\n";
-#                        }
                         if ( $repeat{ $k } eq $k )
                         {
@@ -1278 +1289 @@
                             if ( $depth && $me eq $k )
                             {
-                                $error .= "Module $f field '$k' has  parent repeater which references '$k' as a repeater creating an infinite recursive loop of repeaters\n";
+                                $error .= "Module $f field '$k' has parent repeater which references '$k' as a repeater creating an infinite recursive loop of repeaters\n";
                                 last;
                             }

etc/reserved_words

@@ -44 +44 @@
 import
 int
+integer
 interface
 let

languages/html5/add/js/ga.min.js

@@ -102 +102 @@
 ga.repeat.change=function(a,b,c){var d,e=[],f="#"+b;d=$(f);var g,h="",n="",k,p,l;if(!(ga.repeat.data[a]&&ga.repeat.data[a].repeater&&ga.repeat.data[a].repeater[b]&&d.length))return!1;switch(ga.repeat.data[a].repeater[b].type){case "checkbox":d=d.prop("checked")?1:0;break;case "integer":case "listbox":d=d.val();break;default:return console.warn("ga.repeat.change( "+a+" , "+b+" ) type "+ga.repeat.data[a].repeater[b].type+" not supported"),!1}if(!c&&ga.repeat.data[a].repeater[b].value===d)return!1;g=
 ga.repeat.children(a,b);switch(ga.repeat.data[a].repeater[b].type){case "checkbox":if(d)for(k in g)l=b+"-"+k,h+=ga.repeat.data[a].repeat[k].htmlr.replace(/%%id%%/g,l).replace("%%label%%",""),n+=ga.repeat.data[a].repeat[k].evalr.replace(/%%id%%/g,l),ga.repeat.data[a].repeater[k]&&(ga.repeat.data[a].repeater[l]||(ga.repeat.data[a].repeater[l]=jQuery.extend({},ga.repeat.data[a].repeater[k])),e.push(l),ga.repeat.data[a].repeater[l].value&&delete ga.repeat.data[a].repeater[l].value);break;case "integer":for(p=
-1;p<=d;++p)for(k in g)l=b+"-"+k+"-"+(p-1),h+=ga.repeat.data[a].repeat[k].htmlr.replace(/%%id%%/g,l).replace("%%label%%","["+p+"]"),n+=ga.repeat.data[a].repeat[k].evalr.replace(/%%id%%/g,l),ga.repeat.data[a].repeater[k]&&(ga.repeat.data[a].repeater[l]||(ga.repeat.data[a].repeater[l]=jQuery.extend({},ga.repeat.data[a].repeater[k])),e.push(l),ga.repeat.data[a].repeater[l].value&&delete ga.repeat.data[a].repeater[l].value);break;case "listbox":p=b+"-"+d;g=ga.repeat.children(a,p);for(k in g)l=p+"-"+k,
-h+=ga.repeat.data[a].repeat[k].htmlr.replace(/%%id%%/g,l).replace("%%label%%",""),n+=ga.repeat.data[a].repeat[k].evalr.replace(/%%id%%/g,l),ga.repeat.data[a].repeater[k]&&(ga.repeat.data[a].repeater[l]||(ga.repeat.data[a].repeater[l]=jQuery.extend({},ga.repeat.data[a].repeater[k])),e.push(l),ga.repeat.data[a].repeater[l].value&&delete ga.repeat.data[a].repeater[l].value);break;default:return console.warn("ga.repeat.change( "+a+" , "+b+" ) type "+ga.repeat.data[a].repeater[b].type+" not supported"),
-!1}!/^<tr>/.test(h)&&/<\/tr>$/.test(h)&&(h="<tr>"+h);$(f+"-repeater").html(h);eval(n);ga.repeat.data[a].repeater[b].value=d;for(k=0;k<e.length;++k)ga.repeat.change(a,e[k],c);$("#global_data").data("_pull_json#"+b)&&ga.pull.doPull("#"+b);resetHoverHelp()};ga.hide=function(a,b){ga.hide.data=ga.hide.data||{};ga.hide.data[a]=ga.hide.data[a]||{};ga.hide.data[a][b]=ga.hide.data[a][b]||{};ga.hide.data[a][b].active=1};ga.hide.data={};
+1;p<=d;++p)for(k in g)l=b+"-"+k+"-"+(p-1),h+=ga.repeat.data[a].repeat[k].htmlr.replace(/%%id%%/g,l).replace("%%label%%","["+p+"]"),n+=ga.repeat.data[a].repeat[k].evalr.replace(/%%id%%/g,l),ga.repeat.data[a].repeater[k]&&(ga.repeat.data[a].repeater[l]||(ga.repeat.data[a].repeater[l]=jQuery.extend({},ga.repeat.data[a].repeater[k])),e.push(l),ga.repeat.data[a].repeater[l].value&&delete ga.repeat.data[a].repeater[l].value);break;case "listbox":g=b.replace(/-[0-9]+$/,"").replace(/^(.*)-([A-ZA-z0-9_]*)$/,
+"$2")+"-"+d;p=b+"-"+d;g=ga.repeat.children(a,g);for(k in g)l=p+"-"+k,h+=ga.repeat.data[a].repeat[k].htmlr.replace(/%%id%%/g,l).replace("%%label%%",""),n+=ga.repeat.data[a].repeat[k].evalr.replace(/%%id%%/g,l),ga.repeat.data[a].repeater[k]&&(ga.repeat.data[a].repeater[l]||(ga.repeat.data[a].repeater[l]=jQuery.extend({},ga.repeat.data[a].repeater[k])),e.push(l),ga.repeat.data[a].repeater[l].value&&delete ga.repeat.data[a].repeater[l].value);break;default:return console.warn("ga.repeat.change( "+a+" , "+
+b+" ) type "+ga.repeat.data[a].repeater[b].type+" not supported"),!1}!/^<tr>/.test(h)&&/<\/tr>$/.test(h)&&(h="<tr>"+h);$(f+"-repeater").html(h);eval(n);ga.repeat.data[a].repeater[b].value=d;for(k=0;k<e.length;++k)ga.repeat.change(a,e[k],c);$("#global_data").data("_pull_json#"+b)&&ga.pull.doPull("#"+b);resetHoverHelp()};ga.hide=function(a,b){ga.hide.data=ga.hide.data||{};ga.hide.data[a]=ga.hide.data[a]||{};ga.hide.data[a][b]=ga.hide.data[a][b]||{};ga.hide.data[a][b].active=1};ga.hide.data={};
 ga.hide.update=function(a,b){var c;if(ga.hide.data[a]&&ga.hide.data[a][b])if(ga.hide.data[a][b].hides){if($(b).prop("checked"))for(c in ga.hide.data[a][b].hides)$(c+"-itd").html(" "),$(c).hide();else for(c in ga.hide.data[a][b].hides)$(c+"-itd").html(ga.hide.data[a][b].hides[c]),$(c).show();setHoverHelp()}else console.log("ga.hide.update( "+a+" , "+b+" ) error, no hides attached to this hider");else console.log("ga.hide.update( "+a+" , "+b+" ) error, hider has not been defined")};
 ga.hide.add=function(a,b,c){ga.hide.data=ga.hide.data||{};ga.hide.data[a]=ga.hide.data[a]||{};ga.hide.data[a][c]=ga.hide.data[a][c]||{};ga.hide.data[a][c].hides=ga.hide.data[a][c].hides||{};ga.hide.data[a][c].hides[b]=$(b+"-itd").html()};ga.directives=function(a,b){ga.directives.data=ga.directives.data||{};ga.directives.data[a]=b};ga.hideifnot=function(a,b){ga.directives.data&&ga.directives.data[b]&&!/^(off|false|0$)/.test(ga.directives.data[b].toLowerCase())||$(a).hide()};ga.data={};

languages/html5/base.php

@@ -2 +2 @@
 header('Content-type: application/json');
 # setup php session
+__~debug:basemylog{error_log( "startup __application__ __menu:id__ __menu:modules:id__\n", 3, "/tmp/mylog" );}
 session_start();
 if (!isset($_SESSION['count'])) {
@@ -678 +679 @@
     {
         $a = preg_split( "/-/", $v );
-        __~debug:basemylog{error_log( "preg_split of $v:\n" . json_encode( $a, JSON_PRETTY_PRINT ), 3, "/tmp/mylog" );}
+        __~debug:basemylog{error_log( "preg_split of $v:\n" . json_encode( $a, JSON_PRETTY_PRINT ) . "\n", 3, "/tmp/mylog" );}
         if ( !isset( $_REQUEST[ $a[ 0 ] ] ) || !is_array( $_REQUEST[ $a[ 0 ] ] ) ) {
             $_REQUEST[ $a[ 0 ] ] = [];
@@ -694 +695 @@
     }
 
-__~debug:basemylog{    error_log( "request ready to jsonize\n" . print_r( $_REQUEST, true ) . "\n", 3, "/tmp/mylog" );}
+    __~debug:basemylog{error_log( "request ready to jsonize\n" . print_r( $_REQUEST, true ) . "\n", 3, "/tmp/mylog" );}
+    __~debug:basemylog{error_log( "request in json" . json_encode( $_REQUEST, JSON_PRETTY_PRINT ) . "\n", 3, "/tmp/mylog" );}
     $json = json_encode( $_REQUEST );
     $json = str_replace( "'", "_", $json );

languages/html5/js/repeat.js

@@ -174 +174 @@
     add_html = "",
     add_eval = "",
+    tid,
     i,
     j,
@@ -272 +273 @@
     case "listbox" :
         
+        tid = id.replace( /-[0-9]+$/, "" ).replace( /^(.*)-([A-ZA-z0-9_]*)$/, "$2" ) + "-" + val;
+
         j = id + "-" + val;
 
-        children = ga.repeat.children( mod, j );
-        __~debug:repeat{ for ( i in children ) { console.log( "ga.repeat.change( " + mod + " , " + id + " ) select child " + i );} }
+        __~debug:repeat{console.log( "ga.repeat.change listbox, j is " + j + " val is " + val + " tid " + tid );}
+        children = ga.repeat.children( mod, tid );
+        __~debug:repeat{for ( i in children ) { console.log( "ga.repeat.change( " + mod + " , " + id + " ) select child " + i );} }
 
         for ( i in children ) {