WebSVN - bacoAlunos - Diff - Rev 1782 and 1785 - /branches/v3/impl/src/web/admin/bpmn/processEditor.jsp

     .has-error .chosen-container
+    {
         border: 1px solid #a94442 !important;
+    }
 </style>
 <script>
+var BacoJS = (function () {
+    //"private" variables:
+    var myPrivateVar = "I can be accessed only from within obj.";
+    //"private" method:
+    var orderKeys = function(obj, expected) {
+        var keys = Object.keys(obj).sort(function keyOrder(k1, k2)
+        {
+            if (k1 < k2) return -1;
+            else if (k1 > k2) return +1;
+            else return 0;
+        });
+        var i, after = {};
+        for (i = 0; i < keys.length; i++) {
+            after[keys[i]] = obj[keys[i]];
+            delete obj[keys[i]];
+        }
+        for (i = 0; i < keys.length; i++) {
+            obj[keys[i]] = after[keys[i]];
+        }
+        return obj;
+    }
+    var orderKeysRecur = function orderKeysRecur(obj, expected) {
+        for (var k in obj)
+        {
+            if (typeof obj[k] == "object" && obj[k] !== null)
+                orderKeysRecur(obj[k]);
+            else
+                orderKeys(obj, expected);
+        }
+    }
+    return {
+        stringifyOrdered: function(jsonObj)
+        {
+            return JSON.stringify(orderKeysRecur(jsonObj));
+        }
+    };
+})();
+//console.log(JSON.stringify(orderKeys(example)));
 //DECLARACAO DA APLICACAO LOCAL EM ANGULAR
 var processEditorModule = angular.module('processEditorModule', ['ui.tree']);
 GLOBAL_BacoAngularAppDependencies.push('processEditorModule');
 /**Fim de directiva reutilizavel**/
                     $scope.$apply();
+                }
         );
+    }
+    /*
+    * Variaveis e metodos auxiliares
+    * */
+    $scope.allFlowComponents = [];
+    $scope.autoSavesObjects = [];
+    $scope.idTemp = -1;
+    $scope.jsps = [];
     $scope.variaveisConstantes = [
         "Formulario",
         "Processo",
         "Tarefa",
         "User Executante",
         "User Iniciador Processo",
         "UserSession"
     ];
+    $scope.initBuilder = function()
+    {
+        $scope.initJsps();
+        $scope.inicializarSaves();
-    $scope.allFlowComponents = [];
+        $scope.copiaFlowComponentsDasActorPools();
+    }
-    $scope.autoSavesObjects = [];
+    $scope.initJsps = function()
+    {
+        $scope.callService("loadJspsPlugins",{},function(interfaces)
+        {
+            $scope.jsps = interfaces.jsps;
+            $scope.$apply();
+            $(".angularChosen").chosen();
+        });
+    }
     $scope.inicializarSaves = function()
+    {
         $interval($scope.autoSaves,2000);
+    }
+        }
+    }
-    //$scope.files = {"service":"ok","uploadedFiles":[{fileName:"teste"}]};
-    $scope.idTemp = -1;
-    $scope.jsps = [];
-    $scope.initBuilder = function()
-    {
-        $scope.initJsps();
-        $scope.inicializarSaves();
-        $scope.copiaFlowComponentsDasActorPools();
-    }
-    $scope.initJsps = function()
-    {
-        $scope.callService("loadJspsPlugins",{},function(interfaces)
-        {
-            $scope.jsps = interfaces.jsps;
-            $scope.$apply();
-            $(".angularChosen").chosen();
-        });
-    }
     /** Funções que interagem com directiva reutilizavel **/
     $scope.save = function() {
         $scope.$broadcast('show-errors-check-validity');
         $scope.user = { name: '', email: '' };
+    }
     /** Fim de Funções que interagem com directiva reutilizavel **/
+    /*
+    * Funcoes e variaveis especificas do Processo
+    *
+    * */
     $scope.process = <%=process.toJson()%>;
-    //todo remove do allComponennts
+    $scope.removeActorPool = function(poolId,$index)
+    {
+        var pool = $filter('filter')($scope.process.actorPools, {id: poolId })[0];
+        if(pool.flowComponents && pool.flowComponents.length > 0)
+        {
+            alert("Não pode apagar esta pool com atividades no seu interior");
+        }
+        else
+        {
+            $scope.callSimpleService("removeActorPool",{"poolId":pool.id},function()
+            {
+                $scope.process.actorPools.splice($index,1);
+            });
+        }
+    }
     $scope.removeTask = function (poolId,taskId,$index)
+    {
         $scope.callSimpleService("removeTask",{"poolId":poolId,"taskId":taskId},function()
+        {
             var pool = $filter('filter')($scope.process.actorPools, {id: poolId })[0];
             var index = $scope.allFlowComponents.indexOf(taskInAllFlows );
             $scope.allFlowComponents.splice(index,1);
         });
+    }
-    $scope.removeConnector = function (taskId,connectorId,poolId,$index)
+    $scope.removeConnector = function (connectorId,taskId,poolId,$index)
+    {
         $scope.callSimpleService("removeConnector",{"taskId":taskId,"connectorId":connectorId},function()
+        {
             var pool = $filter('filter')($scope.process.actorPools, {id: poolId })[0];
             var task = $filter('filter')(pool.flowComponents, {id: taskId })[0];
     $scope.addConnector = function(task)
+    {
         $scope.callService("addConnector",{"taskId":task.id},function(connector)
+        {
+            //connector = orderKeys(connector);
             if(task.flowConnectors == null)
                 task.flowConnectors = [];
             task.flowConnectors.push(connector);
             $scope.$apply();
             //invokeChosenSelects("#bpmnPools");
         });
+    }
+    $scope.orderConnector = function(connector)
+    {
+        orderKeys(connector);
+    }
+    $scope.orderKeysRecursive = function(object)
+    {
+        console.log(BacoJS.stringifyOrdered(object));
+    }
     $scope.newRoleForPool = function(item)
+    {
         $scope.idTemp--;
         if(item.roles == null)
+        {
 </style>
 <div class="web-messages"></div>
 <form  style="height: 80vh" class="row" name="processoForm">
     <div  style="height: 80vh;overflow-y: auto;" class="col-md-6 form-horizontal">
+        <button type="button" ng-click="orderKeysRecursive(process)">Ordena</button>
         <div class="panel panel-primary">
             <div class="panel-heading">
                 Identificação do Processo
             </div>
             <div class="panel-body">
             <div ng-repeat="a in process.actorPools" class="panel-body gutter-0">
                 <div class="panel panel-default">
                     <div class="panel-heading clearfix">
                         <a class="pull-right btn btn-default btn-xs bpmnTask" data-nodrag ng-click="addTaskActor(a)" style="margin-right: 8px;">
-                            <span class="bpmn-icon-task"></span></a>
+                            <span class="glyphicon glyphicon-user"></span><span class="bpmn-icon-task"></span></a>
                         <a class="pull-right btn btn-default btn-xs bpmnGateway" data-nodrag ng-click="newFlowComponent('bpmnGateway')" style="margin-right: 8px;">
                             <span class="bpmn-icon-gateway-none"></span></a>
                         <a class="pull-right btn btn-default btn-xs bpmnEndEvent" data-nodrag ng-click="newFlowComponent('bpmnEndEvent')" style="margin-right: 8px;">
                             <span class="bpmn-icon-end-event-none"></span></a>
                     </div>
                                 </div>
                             </div>
                         </div>
                         <div class="col-md-1">
-                            <a class="pull-right btn btn-danger btn-xs" data-nodrag ng-click="process.actorPools.splice($index, 1)"><span
-                                    class="glyphicon glyphicon-remove"></span></a>
+                            <bacoTags:confirm  msg="Tem a certeza que deseja remover a pool {{a.name}}" targetFunction="angular.element($('#processEditorModule')).scope().removeActorPool({{a.id}},{{$index}});angular.element($('#processEditorModule')).scope().$apply();" btnClass="btn btn-danger btn-xs pull-right" icon="glyphicon glyphicon-remove"/>
                         </div>
                     </div>
                     <div class="panel-body">
                         <div ui-tree="treeOptions" id="page-content-root">
                             <div class="form-group">
         <div class="panel-body">
             <table class="tableHeading">
                 <tr>
                     <td><i class="glyphicon glyphicon-resize-vertical" ui-tree-handle></i></td>
                     <td>
-                        <span ng-if="node['@class'] == 'pt.estgp.estgweb.domain.BpmnFlowComponentTaskActorImpl'" class="bpmn-icon-task"></span>
+                        <span ng-if="node['@class'] == 'pt.estgp.estgweb.domain.BpmnFlowComponentTaskActorImpl'">
+                            <span class="glyphicon glyphicon-user"></span><span class="bpmn-icon-task"></span>
+                        </span>
                         <span ng-if="node.type == 'bpmnGateway'" class="bpmn-icon-gateway-none"></span>
                         <span ng-if="node.type == 'bpmnEndEvent'" class="bpmn-icon-end-event-none"></span>
                         <label ng-if="node['@class'] == 'pt.estgp.estgweb.domain.BpmnFlowComponentTaskActorImpl'" class="control-label">Tarefa Actor</label>
                         <label ng-if="node.type == 'bpmnGateway'" class="control-label">Gateway</label>
                         <label ng-if="node.type == 'bpmnEndEvent'" class="control-label">EventoFim</label>
                     class="bpmn-icon-connection"></span></a>
         </div>
     </div>
-    <ol ui-tree-nodes="" data-nodrop-enabled="true" ng-model="node.flowConnectors" ng-class="{hidden: collapsed}">
+    <ol ui-tree-nodes="" data-nodrop-enabled="true" ng-model="node.flowConnectors" ng-class="{hidden: collapsed}" ng-init="task=node">
-        <li ng-repeat="node in node.flowConnectors" ui-tree-node ng-include="'connector_renderer.html'" ng-init="task=node;pool=pool">
+        <li ng-repeat="node in node.flowConnectors" ui-tree-node ng-include="'connector_renderer.html'">
         </li>
     </ol>
 </script>
 <script type="text/ng-template" id="connector_renderer.html">
     <!-- Coloquei aqui o predicado no NGClass que quando existe uma property nodrop = true o angular coloca nodrop na class o que faz o elemento ficar a vermelho e nao permite drop-->
+    <button type="button" ng-click="orderConnector(node)">Ordena</button>
     <div ng-click="select(node)" class="panel panel-info panel-block tree-node tree-node-content bpmnConnector" data-nodrag ng-class="{dirty: node.dirty==true, selected: node.selected == true,nodrop: node.nodrop, nodrag: node.nodrag, moved: node.moved}">
         <div class="panel-heading clearfix" ng-class="node.type">
             <div class="row gutter-0">
                 <table class="tableHeading">
                     <tr>
                         </td>
                         <td class="headingTitle">
                             <input ng-keyup="setDirty(node)" data-nodrag class="form-control" ng-model="node.nameConnection">
                         </td>
                         <td>
-                            <bacoTags:confirm  msg="Tem a certeza que deseja remover o connector {{node.name}}" targetFunction="angular.element($('#processEditorModule')).scope().removeConnector({{task.id}},{{node.id}},{{pool.id}}{{$index}});angular.element($('#processEditorModule')).scope().$apply();" btnClass="btn btn-danger btn-xs pull-right" icon="glyphicon glyphicon-remove"/>
+                            <bacoTags:confirm  msg="Tem a certeza que deseja remover o connector {{node.name}}" targetFunction="angular.element($('#processEditorModule')).scope().removeConnector({{node.id}},{{task.id}},{{pool.id}},{{$index}});angular.element($('#processEditorModule')).scope().$apply();" btnClass="btn btn-danger btn-xs pull-right" icon="glyphicon glyphicon-remove"/>
                         </td>
                     </tr>
                 </table>
             </div>
         </div>
             <div class="form-group">
                 <div class="col-md-2">
                     <span class="glyphicon glyphicon-arrow-right"></span> Ligação
                 </div>
                 <div class="col-md-10">
-                    <select data-nodrag class="form-control" ng-model="node.flowComponentId"
+                    <select ng-change="setDirty(node)" data-nodrag class="form-control" ng-model="node.flowComponentId"
                             ng-options="f.id as f.title for f in allFlowComponents">
                     </select>
                 </div>
             </div>
             <div class="form-group">
                 <div class="col-md-2">
                     <span class="glyphicon glyphicon-tag"></span> Chave
                 </div>
                 <div class="col-md-10">
-                    <input type="text" data-nodrag class="form-control" ng-model="node.keyValue">
+                    <input type="text" ng-keyup="setDirty(node)" data-nodrag class="form-control" ng-model="node.keyValue">
                 </div>
             </div>
             <div class="form-group">
                 <div class="col-md-2">
                     <span class="glyphicon glyphicon-envelope"></span> Enviar Emails
                 </div>
                 <div class="col-md-2">
-                    <select class="form-control chosenOff" ng-model="node.sendEmail" ng-options="o.v as o.n for o in [{ n: 'Sim', v: true }, { n: 'Não', v: false }]">
+                    <select class="form-control chosenOff" ng-change="setDirty(node)" ng-model="node.sendEmail" ng-options="o.v as o.n for o in [{ n: 'Sim', v: true }, { n: 'Não', v: false }]">
                     </select>
                 </div>
             </div>
             <div class="form-group" ng-show="node.sendEmail==true">
                 <div class="col-md-2">
                     Mensagem
                 </div>
                 <div class="col-md-10">
-                    <textarea rows="3" class="form-control" ng-model="node.msgEmail"></textarea>
+                    <textarea ng-keyup="setDirty(node)" rows="3" class="form-control" ng-model="node.msgEmail"></textarea>
                 </div>
             </div>
         </div>
     </div>

Subversion Repositories bacoAlunos

(root)/branches/v3/impl/src/web/admin/bpmn/processEditor.jsp @ 1785 - Rev 1782 → 1785