WebSVN - bacoAlunos - Diff - Rev 1726 and 1727 - /branches/v3/impl/src/web/user/repositoryDocuments/collectionsbrowser.jsp

     .tree-node-content {
         margin: 10px;
+    }
+    .lateMoved
+    {
+        border: 2px solid #65ebff !important;
+    }
     /*Estilo adicionado por mim para os movidos*/
     .moved
+    {
         border: 2px solid blue !important;
+    }
     .modified
+    {
         border: 4px dashed orange !important;
+    }
 </style>
 GLOBAL_BacoAngularAppDependencies.push('treeAppPageContent');
 <!-- estes codigos todos do remove e do toggle e etc's não mechi em nada limitei-me a copiar dos gajos-->
 treeAppPageContent.controller('treeAppPageContentController',  function ($scope) {
+            $scope.movedDocsIds = [];
+            $scope.lateMovedDocsIds = [];
             $scope.data = ${collectionsJson};
             $scope.onlyVisibles = false;
             /*
                 if(node.childs == null)
                     return false;
                 return node.childs.length == 0;
+            }
-            $scope.removeCheckedDocuments = function(collection)
+            $scope.removeCollection = function (collection,parent)
+            {
+                widgetSimpleCallWithActionParameters(
-                angular.forEach(collection.childs, function(collection, key) {
+                        "<%=request.getContextPath()%>/user/repositoryDoc.do",
-                    $scope.removeCheckedDocuments(collection);
+                        "deleteCollection",
-                });
+                        {
-                angular.forEach(collection.documents, function(document, key) {
+                            "collectionId" : collection.id
+                        },
+                        "#treeAppPageContent",
+                        function()
+                        {
+                            if(parent)
+                            {
-                    var index = $scope.checkedDocuments.indexOf(document);
+                                var index = parent.childs.indexOf(collection);
-                    $scope.checkedDocuments.splice(index, 1);
+                                parent.childs.splice(index, 1);
+                            }
+                            else
+                            {
+                                scope.remove();
+                            }
+                            $scope.$apply();
+                        }
-                });
+                );
-            }
+            };
             $scope.changeDocumentCollection = function(collection)
+            {
+                var documentIdsToMove = [];
-                angular.forEach($scope.checkedDocuments, function(document, key)
+                angular.forEach($scope.checkedDocuments, function(documentContainer, key)
+                {
-                    //var index = $scope.checkedDocuments.indexOf(document);
+                    documentIdsToMove.push(documentContainer.document.id);
-                    //$scope.checkedDocuments.splice(index, 1);
-                    collection.push(document);
                 });
                 widgetSimpleCallWithActionParameters(
                         "<%=request.getContextPath()%>/user/repositoryDoc.do",
                         "changeDocumentCollection",
+                        {
-                            "id" : collection.id,
+                            "newCollectionId" : collection.id,
-                            "documents" : JSON.stringify($scope.checkedDocuments)
+                            "documentIds" : JSON.stringify(documentIdsToMove)
                         },
                         "#treeAppPageContent",
                         function()
+                        {
+                            //Adicionar aos Movidos
+                            $scope.movedDocsIds = [];
-                            angular.forEach($scope.checkedDocuments, function(document, key)
+                            angular.forEach($scope.checkedDocuments, function(documentContainer, key)
+                            {
-                                //var index = $scope.checkedDocuments.indexOf(document);
+                                console.log("pushing doc " + documentContainer.document.id);
-                                //$scope.checkedDocuments.splice(index, 1);
+                                $scope.movedDocsIds.push(documentContainer.document.id);
-                                collection.push(document);
+                                $scope.lateMovedDocsIds.push(documentContainer.document.id);
                             });
+                            if(collection.open && collection.open==true)
+                            {
+                                //Adicionar A colecção Nova se estiver aberta
+                                angular.forEach($scope.checkedDocuments, function(documentContainer, key)
+                                {
+                                    //ERRO QUANDO SE PUDHAM DOIS
+                                    collection.documents.push(documentContainer.document);
+                                    delete documentContainer.document.checked;
+                                });
+                            }
+                            else
+                            {
+                                //Abrir se não estiver
+                                $scope.openItem(collection);
+                            }
+                            //Remover da colecção original
+                            angular.forEach($scope.checkedDocuments, function(documentContainer, key)
+                            {
+                                var index = documentContainer.collection.documents.indexOf(documentContainer.document);
+                                documentContainer.collection.documents.splice(index, 1);
+                            });
+                            $scope.checkedDocuments = [];
                             $scope.$apply();
                         },
                         function()
+                        {
                             alert("A operação falhou, verifique os erros");
+                        }
                 );
+            }
+            $scope.documentMoved = function(document)
+            {
+                var returnValue = false;
+                angular.forEach($scope.movedDocsIds, function(docId, key)
+                {
+                    if(document.id == docId)
+                        returnValue = true;
+                });
+                return returnValue;
+            }
+            $scope.lateDocumentMoved = function(document)
+            {
+                var returnValue = false;
+                angular.forEach($scope.lateMovedDocsIds, function(docId, key)
+                {
+                    if(document.id == docId)
+                        returnValue = true;
+                });
+                return returnValue;
+            }
+            $scope.removeCheckedDocuments = function(collection)
+            {
+                angular.forEach(collection.childs, function(collection, key) {
+                    $scope.removeCheckedDocuments(collection);
+                });
+                angular.forEach(collection.documents, function(document, key)
+                {
+                    angular.forEach($scope.checkedDocuments, function(documentContainer, key)
+                    {
+                        if(documentContainer.document == document)
+                        {
+                            var index = $scope.checkedDocuments.indexOf(documentContainer);
+                            $scope.checkedDocuments.splice(index, 1);
+                        }
+                    });
+                });
+            }
             $scope.openItem = function(item)
+            {
                 //apenas deixa abrir neste caso
                     item.open=true;
                     collapseElement.collapse("show");
+                }
+            }
             $scope.checkedDocuments = [];
-            $scope.checkDocument = function(document)
+            $scope.checkDocument = function(document,collection)
+            {
-                //document = scope.$childNodesScope.$modelValue;
                 if(document.checked)
+                {
+                    var docContainer =
+                    {
+                        "document" : document,
+                        "collection" : collection
+                    }
-                    $scope.checkedDocuments.push(document);
+                    $scope.checkedDocuments.push(docContainer);
+                }
                 else
+                {
+                    angular.forEach($scope.checkedDocuments, function(documentContainer, key)
+                    {
+                        if(documentContainer.document == document)
+                        {
-                    var index = $scope.checkedDocuments.indexOf(document);
+                            var index = $scope.checkedDocuments.indexOf(documentContainer);
-                    $scope.checkedDocuments.splice(index, 1);
+                            $scope.checkedDocuments.splice(index, 1);
+                        }
+                    });
+                }
+            }
             $scope.hideNode = function(node)
+            {
                 if(!node.visible && $scope.onlyVisibles)
                     return true;
                 return false;
 </script>
 <!--TEMPLATE RECURSIVO-->
 <script type="text/ng-template" id="childs_renderer.html">
     <!--Para nao deixar fazer drag-->
-    <div data-nodrag class="tree-node tree-node-content clearfix" ng-class="{modified: node.modified, nodrop: node.nodrop, nodrag: node.nodrag, moved: node.moved, bacoInvisible: !node.visible, hidden: hideNode(node)}">
+    <div ng-init="collection = node" data-nodrag class="tree-node tree-node-content clearfix" ng-class="{modified: node.modified, nodrop: node.nodrop, nodrag: node.nodrag, bacoInvisible: !node.visible, hidden: hideNode(node)}">
-            <button ng-click="changeDocumentCollection(node)" data-toggle="tooltip" title="Mover documentos para aqui" class="btn btn-xs btn-warning" ng-show="checkedDocuments.length"><span class="glyphicon glyphicon-arrow-right"></span></button>
             <a class="btn btn-xs" ng-class="{
                                             'btn-default': !node.open,
                                             'btn-success': node.open,
                                           }"
                 <span class="glyphicon glyphicon-ban-circle"/>
             </label>
             {{node.name}}
+            <button ng-click="changeDocumentCollection(node)" data-toggle="tooltip" title="Mover documentos para aqui" class="btn btn-xs btn-warning" ng-show="checkedDocuments.length"><span class="glyphicon glyphicon-arrow-left"></span></button>
+            <button ng-click="removeCollection(node,parent)" data-toggle="tooltip" title="Remover Colecção" class="btn btn-xs btn-danger pull-right"><span class="glyphicon glyphicon-remove"></span></button>
     </div>
     <ol data-nodrag ui-tree-nodes="" data-nodrop-enabled="true" ng-model="node" ng-class="{hidden: collapsed }">
-        <li ng-repeat="node in node.childs" ui-tree-node ng-include="'childs_renderer.html'">
+        <li ng-repeat="node in node.childs" ui-tree-node ng-include="'childs_renderer.html'" ng-init="parent = collection">
         </li>
         <li ng-repeat="node in node.documents" ui-tree-node ng-include="'documents_renderer.html'">
         </li>
     </ol>
 </script>
 <!--TEMPLATE RECURSIVO-->
 <script type="text/ng-template" id="documents_renderer.html">
     <!--Para nao deixar fazer drag-->
-    <div data-nodrag class="tree-node tree-node-document tree-node-content clearfix" ng-class="{modified: node.modified, nodrop: node.nodrop, nodrag: node.nodrag, moved: node.moved, bacoInvisible: !node.visible, hidden: hideNode(node)}">
+    <div data-nodrag class="tree-node tree-node-document tree-node-content clearfix" ng-class="{modified: node.modified, nodrop: node.nodrop, nodrag: node.nodrag, moved: documentMoved(node),lateMoved: lateDocumentMoved(node), bacoInvisible: !node.visible, hidden: hideNode(node)}">
+        <!--a var collection vem do template da colecção pai onde se fez ng-init="collection = node"-->
-        <input type="checkbox" ng-click="checkDocument(node)" ng-model="node.checked" style="font-size: 1.4em; margin-right: 10px">
+        <input type="checkbox" ng-click="checkDocument(node,collection)" ng-model="node.checked" style="font-size: 1.4em; margin-right: 10px">
         <a class="btn btn-xs" ng-class="{
                                         'btn-default': !node.open,
                                         'btn-success': node.open,
                                       }"
            data-nodrag data-toggle="collapse" ng-click="openDocumentsItem(node)">
                         <span
                                 class="glyphicon"
                                 ng-class="{
-                                        'glyphicon-chevron-right': !node.open,
+                                        'glyphicon-zoom-in': !node.open,
-                                        'glyphicon-chevron-down': node.open
+                                        'glyphicon-zoom-out': node.open
                                       }">
                         </span>
         </a>
-        <span class="glyphicon glyphicon-file"></span>  {{node.title}}
+        <span class="glyphicon glyphicon-file"></span>  {{node.title}} {{node.id}}
         <baco:hasRole role="admin,all,repositoryDocs">
             <a target="_blank" class="pull-right btn btn-warning btn-xs" href="<%=request.getContextPath()%>/user/repositoryEditDocument.do?repositoryDocumentId={{node.id}}">
                 <span class="glyphicon glyphicon-pencil"></span>
             </a>

Subversion Repositories bacoAlunos

(root)/branches/v3/impl/src/web/user/repositoryDocuments/collectionsbrowser.jsp @ 1727 - Rev 1726 → 1727