fixed procesEditor slow loading

SE/se-lib/Route/UrlAction/ProcesEditor.php

@@ -425,7 +425,7 @@ class Route_UrlAction_ProcesEditor extends RouteBase {// TODO: UrlActionBase @se
 
 		<script src="static/videoPlayer.js?v=19<?php echo "&_time=" . time(); ?>"></script>
 		<script src="static/jquery.fileupload.js"></script>
-		<script src="static/procesEditor.js?v=19<?php echo "&_time=" . time(); ?><?php if (V::get('DBG', '', $_GET)) echo "&_time=" . time(); ?>"></script>
+		<script src="static/procesEditor.js?v=20<?php if (V::get('DBG', '', $_GET)) echo "&_time=" . time(); ?>"></script>
 <?php
 	}
 

SE/static/procesEditor.js

@@ -217,27 +217,25 @@ $(document).ready(function() {
                                 //console.log(getIndexById(id));
                                 var newId = state[getIndexById(id)][type].push(temp) - 1;
 
-                                var linkImg = BASE_URL +
-                                    'wfs-data.php/default_db/?SERVICE=WFS&VERSION=1.0.0&REQUEST=GetFeature&TYPENAME=p5_default_db:CRM_IMAGE&SRSNAME=EPSG:3003&Filter=<ogc:Filter><ogc:And><ogc:PropertyIsEqualTo><ogc:PropertyName>REMOTE_ID</ogc:PropertyName><ogc:Literal>' + wsk["ID"] +
-                                    '</ogc:Literal></ogc:PropertyIsEqualTo><ogc:PropertyIsEqualTo><ogc:PropertyName>REMOTE_TABLE</ogc:PropertyName><ogc:Literal>CRM_WSKAZNIK</ogc:Literal></ogc:PropertyIsEqualTo></ogc:And></ogc:Filter>';
-
-
-                                $.get(linkImg, function(imgData) {
-
-                                    var temp = Array();
-                                    $.each($(imgData).find("featureMember"), function() {
-
-                                        temp.push({
-                                            "src": base64_decode($(this).find("IMAGE").text()),
-                                            "title": $(this).find("NAME").text(),
-                                            "id": $(this).find("ID").text(),
-                                        });
-                                    })
-                                    state[getIndexById(id)][type][newId]["img"] = temp;
-                                    $("#main").html("<center>Generowanie widoku.</center>");
-                                    render(state, $("#main"));
-                                });
+								state[getIndexById(id)][type][newId]["img"] = temp;
+                                // var linkImg = BASE_URL +
+                                //     'wfs-data.php/default_db/?SERVICE=WFS&VERSION=1.0.0&REQUEST=GetFeature&TYPENAME=p5_default_db:CRM_IMAGE&SRSNAME=EPSG:3003&Filter=<ogc:Filter><ogc:And><ogc:PropertyIsEqualTo><ogc:PropertyName>REMOTE_ID</ogc:PropertyName><ogc:Literal>' + wsk["ID"] +
+                                //     '</ogc:Literal></ogc:PropertyIsEqualTo><ogc:PropertyIsEqualTo><ogc:PropertyName>REMOTE_TABLE</ogc:PropertyName><ogc:Literal>CRM_WSKAZNIK</ogc:Literal></ogc:PropertyIsEqualTo></ogc:And></ogc:Filter>';
+                                // $.get(linkImg, function(imgData) {
+                                //     var temp = Array();
+                                //     $.each($(imgData).find("featureMember"), function() {
+                                //         temp.push({
+                                //             "src": base64_decode($(this).find("IMAGE").text()),
+                                //             "title": $(this).find("NAME").text(),
+                                //             "id": $(this).find("ID").text(),
+                                //         });
+                                //     })
+                                //     state[getIndexById(id)][type][newId]["img"] = temp;
+                                //     $("#main").html("<center>Generowanie widoku.</center>");
+                                //     render(state, $("#main"));
+                                // });
                             });
+							render(state, $("#main"));
                         })
                         .fail(function(xhr) {
                             if (xhr.responseJSON && xhr.responseJSON.msg && xhr.responseJSON.type) jQuery.notify(xhr.responseJSON.msg, xhr.responseJSON.type);
@@ -1767,6 +1765,9 @@ $(document).ready(function() {
 
     function showMediaElement(data, type) {
         var el = ""
+		if (!data || undefined === data['ID']) return '';
+		if ('video' === type && undefined === data['VIDEO_ID']) return '';
+		if ('img' === type && undefined === data['IMAGE']) return '';
         if (type == "video") {
             //el += "<div class=attVid><div class=remImg>X</div>"
             el += "<div class=attVid><div class=imgTitle><i class='glyphicon glyphicon-option-vertical'></i>"
@@ -2523,11 +2524,6 @@ $(document).ready(function() {
             success: function(data) {
                 var i = 0;
                 $.each($(data).find("featureMember"), function() {
-                    var linkImg = BASE_URL + 'wfs-data.php/default_db/?SERVICE=WFS&VERSION=1.0.0&REQUEST=GetFeature&TYPENAME=p5_default_db:CRM_IMAGE&SRSNAME=EPSG:3003&Filter=<ogc:Filter><ogc:And><ogc:PropertyIsEqualTo><ogc:PropertyName>REMOTE_ID</ogc:PropertyName><ogc:Literal>' + $(this).find("ID").text() + '</ogc:Literal></ogc:PropertyIsEqualTo><ogc:PropertyIsEqualTo><ogc:PropertyName>REMOTE_TABLE</ogc:PropertyName><ogc:Literal>CRM_PROCES</ogc:Literal></ogc:PropertyIsEqualTo></ogc:And></ogc:Filter>';
-
-                    $.get(linkImg, function(imgData) {
-
-                    });
                     var temp = {};
                     if ($(this).find("ID").text() == "0")
                         return;
@@ -2546,18 +2542,18 @@ $(document).ready(function() {
                     temp["stepDesc"] = "";
                     i++;
                     state.splice(parentIndex + i, 0, temp);
-                    var linkImg = BASE_URL + 'wfs-data.php/default_db/?SERVICE=WFS&VERSION=1.0.0&REQUEST=GetFeature&TYPENAME=p5_default_db:CRM_IMAGE&SRSNAME=EPSG:3003&Filter=<ogc:Filter><ogc:And><ogc:PropertyIsEqualTo><ogc:PropertyName>REMOTE_ID</ogc:PropertyName><ogc:Literal>' + temp["id"] + '</ogc:Literal></ogc:PropertyIsEqualTo><ogc:PropertyIsEqualTo><ogc:PropertyName>REMOTE_TABLE</ogc:PropertyName><ogc:Literal>CRM_PROCES</ogc:Literal></ogc:PropertyIsEqualTo></ogc:And></ogc:Filter>';
-                    $.get(linkImg, function(imgData) {
-                        var temp = Array();
-                        $.each($(imgData).find("featureMember"), function() {
-                            temp.push({
-                                "src": base64_decode($(this).find("IMAGE").text()),
-                                "title": $(this).find("NAME").text(),
-                                "id": $(this).find("ID").text(),
-                            });
-                        })
-                        state[getIndexById(temp["id"])]["img"] = temp;
-                    });
+                    // var linkImg = BASE_URL + 'wfs-data.php/default_db/?SERVICE=WFS&VERSION=1.0.0&REQUEST=GetFeature&TYPENAME=p5_default_db:CRM_IMAGE&SRSNAME=EPSG:3003&Filter=<ogc:Filter><ogc:And><ogc:PropertyIsEqualTo><ogc:PropertyName>REMOTE_ID</ogc:PropertyName><ogc:Literal>' + temp["id"] + '</ogc:Literal></ogc:PropertyIsEqualTo><ogc:PropertyIsEqualTo><ogc:PropertyName>REMOTE_TABLE</ogc:PropertyName><ogc:Literal>CRM_PROCES</ogc:Literal></ogc:PropertyIsEqualTo></ogc:And></ogc:Filter>';
+                    // $.get(linkImg, function(imgData) {
+                    //     var temp = Array();
+                    //     $.each($(imgData).find("featureMember"), function() {
+                    //         temp.push({
+                    //             "src": base64_decode($(this).find("IMAGE").text()),
+                    //             "title": $(this).find("NAME").text(),
+                    //             "id": $(this).find("ID").text(),
+                    //         });
+                    //     })
+                    //     state[getIndexById(temp["id"])]["img"] = temp;
+                    // });
                     genTree($(this).find("ID").text());
                 });
             }
@@ -2695,18 +2691,18 @@ $(document).ready(function() {
                 temp["opis"] = $(data).find("featureMember").find("OPIS").text()
 
                 state[0] = temp;
-                var linkImg = BASE_URL + 'wfs-data.php/default_db/?SERVICE=WFS&VERSION=1.0.0&REQUEST=GetFeature&TYPENAME=p5_default_db:CRM_IMAGE&SRSNAME=EPSG:3003&Filter=<ogc:Filter><ogc:And><ogc:PropertyIsEqualTo><ogc:PropertyName>REMOTE_ID</ogc:PropertyName><ogc:Literal>' + mainProces_id + '</ogc:Literal></ogc:PropertyIsEqualTo><ogc:PropertyIsEqualTo><ogc:PropertyName>REMOTE_TABLE</ogc:PropertyName><ogc:Literal>CRM_PROCES</ogc:Literal></ogc:PropertyIsEqualTo></ogc:And></ogc:Filter>';
-                $.get(linkImg, function(imgData) {
-                    var temp = Array();
-                    $.each($(imgData).find("featureMember"), function() {
-                        temp.push({
-                            "src": base64_decode($(this).find("IMAGE").text()),
-                            "title": $(this).find("NAME").text(),
-                            "id": $(this).find("ID").text(),
-                        });
-                    })
-                    state[0]["img"] = temp;
-                });
+                // var linkImg = BASE_URL + 'wfs-data.php/default_db/?SERVICE=WFS&VERSION=1.0.0&REQUEST=GetFeature&TYPENAME=p5_default_db:CRM_IMAGE&SRSNAME=EPSG:3003&Filter=<ogc:Filter><ogc:And><ogc:PropertyIsEqualTo><ogc:PropertyName>REMOTE_ID</ogc:PropertyName><ogc:Literal>' + mainProces_id + '</ogc:Literal></ogc:PropertyIsEqualTo><ogc:PropertyIsEqualTo><ogc:PropertyName>REMOTE_TABLE</ogc:PropertyName><ogc:Literal>CRM_PROCES</ogc:Literal></ogc:PropertyIsEqualTo></ogc:And></ogc:Filter>';
+                // $.get(linkImg, function(imgData) {
+                //     var temp = Array();
+                //     $.each($(imgData).find("featureMember"), function() {
+                //         temp.push({
+                //             "src": base64_decode($(this).find("IMAGE").text()),
+                //             "title": $(this).find("NAME").text(),
+                //             "id": $(this).find("ID").text(),
+                //         });
+                //     })
+                //     state[0]["img"] = temp;
+                // });
                 genTree(mainProces_id);
             });
             actSite = "preview";