Преглед изворни кода

fixed TaskManager sort prio field in wfs getFeature action, fixed load css

Piotr Labudda пре 9 година
родитељ
комит
b07dc7b93e

+ 1 - 1
SE/se-lib/Route/UrlAction/TaskManager.php

@@ -103,7 +103,7 @@ class Route_UrlAction_TaskManager extends RouteBase {// TODO: UrlActionBase @see
 		echo '<link rel="stylesheet" type="text/css" href="static/sweetalert2.min.css">';
 		// echo '<link rel="stylesheet" href="static/task.css?'.time().'" type="text/css" />';
 		UI::startTag('style', ['type' => "text/css"]);
-		include dirname(__FILE__) . '.task.css';
+		echo file_get_contents(__FILE__ . '.task.css');
 		UI::endTag('style');
 
 		echo '<script src="static/sweetalert2.min.js"></script>';

+ 1 - 1
SE/se-lib/Route/UrlAction/TaskManager.php.task.js

@@ -745,7 +745,7 @@ $(document).ajaxStop(function() {
 
 function getData() {
   if (TYPE == "PROBLEM") {
-    link = BASE_URL + 'wfs-data.php/default_db/?SERVICE=WFS&VERSION=1.0.0&REQUEST=GetFeature&TYPENAME=p5_default_db:PROBLEMS&SRSNAME=EPSG:3003&Filter=<ogc:Filter><ogc:And><ogc:PropertyIsEqualTo><ogc:PropertyName>PARENT_ID</ogc:PropertyName><ogc:Literal>' + TASK + '</ogc:Literal></ogc:PropertyIsEqualTo><ogc:Not><ogc:PropertyIsEqualTo><ogc:PropertyName>A_STATUS</ogc:PropertyName><ogc:Literal>Deleted</ogc:Literal></ogc:PropertyIsEqualTo></ogc:Not></ogc:And></ogc:Filter>&sortBy=SORT_PRIO+A';
+    link = BASE_URL + 'wfs-data.php/default_db/?SERVICE=WFS&VERSION=1.0.0&REQUEST=GetFeature&TYPENAME=p5_default_db:PROBLEMS&SRSNAME=EPSG:3003&Filter=<ogc:Filter><ogc:And><ogc:PropertyIsEqualTo><ogc:PropertyName>PARENT_ID</ogc:PropertyName><ogc:Literal>' + TASK + '</ogc:Literal></ogc:PropertyIsEqualTo><ogc:Not><ogc:PropertyIsEqualTo><ogc:PropertyName>A_STATUS</ogc:PropertyName><ogc:Literal>Deleted</ogc:Literal></ogc:PropertyIsEqualTo></ogc:Not></ogc:And></ogc:Filter>&sortBy=ID+D';//SORT_PRIO+A';
   }
   if (TYPE == "PROJECT") {
     link = BASE_URL + 'wfs-data.php/default_db/?SERVICE=WFS&VERSION=1.0.0&REQUEST=GetFeature&TYPENAME=p5_default_db:PROBLEMS&SRSNAME=EPSG:3003&Filter=<ogc:Filter><ogc:And><ogc:PropertyIsEqualTo><ogc:PropertyName>ID_PROJECT</ogc:PropertyName><ogc:Literal>' + TASK + '</ogc:Literal></ogc:PropertyIsEqualTo><ogc:PropertyIsEqualTo><ogc:PropertyName>PARENT_ID</ogc:PropertyName><ogc:Literal>0</ogc:Literal></ogc:PropertyIsEqualTo><ogc:Not><ogc:PropertyIsEqualTo><ogc:PropertyName>A_STATUS</ogc:PropertyName><ogc:Literal>DELETED</ogc:Literal></ogc:PropertyIsEqualTo></ogc:Not></ogc:And></ogc:Filter>&sortBy=SORT_PRIO+A';