[Fmsystem-commits] [16408] more on eventplanner

[sigurdne]

Revision: 16408
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16408
Author:   sigurdne
Date:     2017-03-07 09:46:59 -0500 (Tue, 07 Mar 2017)
Log Message:
-----------
more on eventplanner

Modified Paths:
--------------
    trunk/eventplanner/inc/class.uiapplication.inc.php
    trunk/eventplanner/inc/class.uivendor.inc.php
    trunk/eventplannerfrontend/js/portico/application.edit.js
    trunk/eventplannerfrontend/templates/base/application.xsl

Added Paths:
-----------
    trunk/eventplannerfrontend/js/portico/vendor.edit.js

Modified: trunk/eventplanner/inc/class.uiapplication.inc.php
===================================================================
--- trunk/eventplanner/inc/class.uiapplication.inc.php  2017-03-07 14:06:34 UTC 
(rev 16407)
+++ trunk/eventplanner/inc/class.uiapplication.inc.php  2017-03-07 14:46:59 UTC 
(rev 16408)
@@ -420,7 +420,7 @@
                        );
                        phpgwapi_jquery::formvalidator_generate(array('date', 
'security', 'file'));
                        phpgwapi_jquery::load_widget('autocomplete');
-                       self::add_javascript('eventplanner', 'portico', 
'application.edit.js');
+                       self::add_javascript('eventplannerfrontend', 'portico', 
'application.edit.js');
                        self::render_template_xsl(array('application', 
'datatable_inline'), array($mode => $data));
                }
 

Modified: trunk/eventplanner/inc/class.uivendor.inc.php
===================================================================
--- trunk/eventplanner/inc/class.uivendor.inc.php       2017-03-07 14:06:34 UTC 
(rev 16407)
+++ trunk/eventplanner/inc/class.uivendor.inc.php       2017-03-07 14:46:59 UTC 
(rev 16408)
@@ -248,7 +248,7 @@
                                        'type' => 'custom',
                                        'className' => 'add',
                                        'custom_code' => "
-                                                               
add_application({$id}, '{$this->currentapp}.uiapplication.edit' );"
+                                                               
add_application('{$this->currentapp}', 
'{$this->currentapp}.uiapplication.edit', {$id});"
                                )
                        );
 

Modified: trunk/eventplannerfrontend/js/portico/application.edit.js
===================================================================
--- trunk/eventplannerfrontend/js/portico/application.edit.js   2017-03-07 
14:06:34 UTC (rev 16407)
+++ trunk/eventplannerfrontend/js/portico/application.edit.js   2017-03-07 
14:46:59 UTC (rev 16408)
@@ -1,8 +1,8 @@
 var vendor_id_selection;
 
 var lang;
-var oArgs = {menuaction: 'eventplanner.uivendor.index', organization_number: 
true};
-var strURL = phpGWLink('index.php', oArgs, true);
+var oArgs = {menuaction: 'eventplannerfrontend.uivendor.index', 
organization_number: true};
+var strURL = phpGWLink('eventplannerfrontend/', oArgs, true);
 JqueryPortico.autocompleteHelper(strURL, 'vendor_name', 'vendor_id', 
'vendor_container', 'name');
 
 $(window).on('load', function ()
@@ -31,11 +31,11 @@
                return;
        }
        oArgs = {
-               menuaction: 'eventplanner.uivendor.get',
+               menuaction: 'eventplannerfrontend.uivendor.get',
                id: vendor_id
        };
 
-       var requestUrl = phpGWLink('index.php', oArgs, true);
+       var requestUrl = phpGWLink('eventplannerfrontend/', oArgs, true);
        var data = {};
 
        JqueryPortico.execute_ajax(requestUrl,
@@ -269,11 +269,11 @@
        }
 
        oArgs = {
-               menuaction: 'eventplanner.uibooking.save_ajax',
+               menuaction: 'eventplannerfrontend.uibooking.save_ajax',
                application_id: $("#application_id").val()
        };
 
-       var requestUrl = phpGWLink('index.php', oArgs, true);
+       var requestUrl = phpGWLink('eventplannerfrontend/', oArgs, true);
        var htmlString = '';
        $("#receipt").html("");
        var data = {from_: from_, active: 1};
@@ -319,9 +319,9 @@
        {
                return;
        }
-       oArgs = {menuaction: 'eventplanner.uibooking.update_schedule'};
+       oArgs = {menuaction: 'eventplannerfrontend.uibooking.update_schedule'};
 
-       var requestUrl = phpGWLink('index.php', oArgs, true);
+       var requestUrl = phpGWLink('eventplannerfrontend/', oArgs, true);
        var htmlString = '';
        $("#receipt").html("");
 
@@ -391,9 +391,9 @@
        {
                var data = {"ids": ids, "action": action, from_: 
$("#from_").val()};
 
-               oArgs = {menuaction: 
'eventplanner.uibooking.update_active_status'};
+               oArgs = {menuaction: 
'eventplannerfrontend.uibooking.update_active_status'};
 
-               var requestUrl = phpGWLink('index.php', oArgs, true);
+               var requestUrl = phpGWLink('eventplannerfrontend/', oArgs, 
true);
 
                var htmlString = '';
                $("#receipt").html("");

Added: trunk/eventplannerfrontend/js/portico/vendor.edit.js
===================================================================
--- trunk/eventplannerfrontend/js/portico/vendor.edit.js                        
        (rev 0)
+++ trunk/eventplannerfrontend/js/portico/vendor.edit.js        2017-03-07 
14:46:59 UTC (rev 16408)
@@ -0,0 +1,37 @@
+function set_tab(tab)
+{
+       $("#active_tab").val(tab);
+       if (tab === 'application')
+       {
+               $("#submit_group_bottom").hide();
+       }
+       else
+       {
+               $("#submit_group_bottom").show();
+       }
+}
+
+add_application = function (app, menuaction, vendor_id)
+{
+       if (!vendor_id)
+       {
+               return;
+       }
+
+       oArgs = {
+               menuaction: menuaction,
+               vendor_id: vendor_id
+       };
+
+       var requestUrl;
+       if (app === 'eventplannerfrontend')
+       {
+               requestUrl = phpGWLink('eventplannerfrontend/', oArgs);
+       }
+       else
+       {
+               requestUrl = phpGWLink('index.php', oArgs);
+       }
+       alert(requestUrl);
+       window.location = requestUrl;
+};

Modified: trunk/eventplannerfrontend/templates/base/application.xsl
===================================================================
--- trunk/eventplannerfrontend/templates/base/application.xsl   2017-03-07 
14:06:34 UTC (rev 16407)
+++ trunk/eventplannerfrontend/templates/base/application.xsl   2017-03-07 
14:46:59 UTC (rev 16408)
@@ -137,12 +137,13 @@
                                                                                
<xsl:text>required</xsl:text>
                                                                        
</xsl:attribute>
                                                                </input>
+                                                               <!--
                                                                <xsl:text> 
</xsl:text>
                                                                <a 
href="{new_vendor_url}" target="_blank">
                                                                        
<xsl:value-of select="php:function('lang', 'new')"/>
                                                                        
<xsl:text> </xsl:text>
                                                                        
<xsl:value-of select="php:function('lang', 'vendor')"/>
-                                                               </a>
+                                                               </a>-->
                                                                <div 
id="vendor_container"/>
                                                        </div>
                                                        <div 
class="pure-control-group">