Merge branch 'develop' into 'master'

Develop

See merge request !839

src/presentation/maarchRM/Presenter/recordsManagement/archive.php

@@ -137,8 +137,6 @@ class archive
     }
 
     /**
-     *
-     *
      * @param array   $archives Array of archive object
      * @param integer $count    Count of archive object without limit
      *
@@ -394,6 +392,12 @@ class archive
         $lifeCycleDataTable->setPaginationType("full_numbers");
         $lifeCycleDataTable->setSorting(array(array(0, 'desc')));
 
+        $relationshipDataTable = $this->view->getElementById('relationshipsTable')->plugin['dataTable'];
+        $relationshipDataTable->setPaginationType("full_numbers");
+        $relationshipDataTable->setUnsearchableColumns(3);
+        $relationshipDataTable->setUnsortableColumns(3);
+        $relationshipDataTable->setSorting(array(array(0, 'desc')));
+
         $this->view->translate();
         $this->view->merge();
 
@@ -1400,10 +1404,11 @@ class archive
                 $relationship->relatedArchiveName = $childRelationship->relatedArchiveName;
                 $relationship->description = $childRelationship->description;
                 $relationship->typeCode = $childRelationship->typeCode;
+                $relationships[] = $relationship;
             }
-            $relationships[] = $relationship;
+            $archive->relationships = $relationships;
         }
-
+       
         if (!empty($archive->relationships["parentRelationships"])) {
             foreach ($archive->relationships["parentRelationships"] as $parentRelationship) {
                 $relationship = new \stdClass();
@@ -1411,10 +1416,10 @@ class archive
                 $relationship->relatedArchiveName = $parentRelationship->relatedArchiveName;
                 $relationship->description = $parentRelationship->description;
                 $relationship->typeCode = $parentRelationship->typeCode;
+                $relationships[] = $relationship;
             }
-            $relationships[] = $relationship;
+            $archive->relationships = $relationships;
         }
-        $archive->relationships = $relationships;
     }
 
     protected function checkMessage($archive)

src/presentation/maarchRM/Presenter/recordsManagement/archiveRelationship.php

@@ -83,12 +83,11 @@ class archiveRelationship
      */
     public function getByArchiveId($archiveRelationships)
     {
-        
         $this->view->addContentFile("recordsManagement/archiveRelationship/relationshipTable.html");
         $this->view->setSource("archiveRelationships", $archiveRelationships);
         $this->view->merge();
         $this->view->translate();
-        
+
         return $this->view->saveHtml();
     }
     
@@ -121,4 +120,4 @@ class archiveRelationship
         
         return $this->json->save();
     }
-}
+}
\ No newline at end of file

src/presentation/maarchRM/Resources/view/recordsManagement/archive/archiveInfo/archiveInfo.html

@@ -15,7 +15,7 @@
             <a href="#relationshipTab" data-toggle="tab">Relationships</a>
         </li>
         <?merge archive.messages.bool() ?>
-        <li role="presentation" id="organizationInfo_messageTab">
+        <li role="presentation" id="organizationInfo_messageTab">archiveInfo
             <a href="#messageTab" data-toggle="tab">Message</a>
         </li>
     </ul>
@@ -62,4 +62,4 @@
     $("#lifeCycleTab").on('click', '.attestation', function () {
         eventCertificate.load($(this).data('eventid'));
     });
-</script>
+</script>
\ No newline at end of file

src/presentation/maarchRM/Resources/view/recordsManagement/archive/archiveInfo/relationships.html

 <?merge archive.relationships.bool() ?>
 
-<div class="table-responsive">
-    <table id="relationshipsTable" class="table table-condensed table-striped dataTable">
+<div>
+    <table id="relationshipsTable" class="table dataTable">
         <thead>
             <tr>
                 <th>Type</th>
                 <th>Related archive</th>
                 <th>Description</th>
-                <th style="opacity: 0;"/>
+                <th class="sorting_disabled"></th>
             </tr>
         </thead>
             <tbody>
@@ -20,11 +20,15 @@
                         <?merge .relatedArchiveName ?>
                     </td>
                     <td>
-                        <?merge .description ?>
+                        <?merge .description.json() ?>
                     </td>
-                    <td style="padding-right:1em;" class='pull-right'>
-                        <button type="button" class="btn btn-success btn-sm viewRelatedArchive" title="Show the archive info"
-                            data-archiveid='[?merge .relatedArchiveId ?]'>
+                    <td>
+                        <button
+                                type="button"
+                                class="btn btn-success btn-sm viewRelatedArchive pull-right"
+                                title="Show the archive info"
+                                data-archiveid='[?merge .relatedArchiveId ?]'
+                        >
                             <i class="fa fa-eye"></i>
                         </button>
                     </td>

src/presentation/maarchRM/Resources/view/recordsManagement/archive/relationships.html

@@ -7,31 +7,33 @@
             </div>
         </div>
         <div class="table-responsive">
-            <table id="relationshipsTable" class="table table-condensed table-striped dataTable">
+            <table id="relationshipsTable" class="table dataTable"">
                 <thead>
                     <tr>
                         <th>Archive</th>
                         <th>Type</th>
                         <th>Related archive</th>
                         <th>Description</th>
+                        <th></th>
                     </tr>
                 <thead>
                 <tbody>
                     <?merge archive.childrenRelationships ?>
                     <tr>
                         <td><i class="fa fa-thumb-tack" style="font-size:25px">&nbsp;</i></td>
-                        <td><?merge .typeCode ?></td>
+                        <td><?merge relationship.typeCode ?></td>
+                        <td><?merge .description ?></td>
                         <td>
-                            <button type="button" class="btn btn-success btn-sm viewRelatedArchive" title="Show the archive info" data-archiveid='[?merge .relatedArchiveId ?]'>
-                                <i class="fa fa-info-circle"></i>&nbsp;<?merge .relatedArchiveId ?>
+                            <button type="button" class="btn btn-success btn-sm viewRelatedArchive pull-right" title="Show the archive info" data-archiveid='[?merge relationship.relatedArchiveId ?]'>
+                                <i class="fa fa-info-circle"></i>&nbsp;<?merge relationship.relatedArchiveId ?>
                             </button>
                         </td>
-                        <td><?merge .description ?></td>
                     </tr>
+
                     <?merge archive.parentRelationships ?>
                     <tr>
                         <td>
-                            <button type="button" class="btn btn-success btn-sm viewRelatedArchive" title="Show the archive info" data-archiveid='[?merge .archiveId ?]'>
+                            <button type="button" class="btn btn-success btn-sm viewRelatedArchive pull-right" title="Show the archive info" data-archiveid='[?merge .archiveId ?]'>
                                 <i class="fa fa-info-circle"></i>&nbsp;<?merge .archiveId ?>
                             </button>
                         </td>

src/presentation/maarchRM/Resources/view/recordsManagement/archive/search.html

@@ -240,8 +240,6 @@
         addHelperText(helperText, helperName, helperType, helperFormat, isExternalRef, enumeration, enumNames);
     });
 
-
-
     $('#addHelper').on('click', function () {
         var helper = $('#helperSelect').find("option:selected");
         var helperText = $("#helperSelect :selected").text();

web/public/js/bootstrap-tree/bootstrap-tree.js

@@ -106,11 +106,15 @@ var BootstrapTree = {
             i.addClass(openedIcon).removeClass(closedIcon);
         }
     },
-     toggleChildren :function(element) {
+
+    toggleChildren: function(element) {
         element.each(function() {
             var childLi = $(this);
             var childIcon = childLi.find(' > span > i');
 
+            var closedIcon = childIcon.data('closed-icon');
+            var openedIcon = childIcon.data('opened-icon');
+
             if (childIcon.hasClass(openedIcon)) {
                 childLi.find('> ul > li').css({'display':'none'});
                 childIcon.addClass(closedIcon).removeClass(openedIcon);
@@ -119,7 +123,7 @@ var BootstrapTree = {
                 childIcon.addClass(openedIcon).removeClass(closedIcon);
             }
 
-            toggleChildren(childLi.find('> ul > li'));
+            BootstrapTree.toggleChildren(childLi.find('> ul > li'));
         });
     },
 
@@ -139,10 +143,8 @@ var BootstrapTree = {
             children.css({'display':'block'});
             i.addClass(openedIcon).removeClass(closedIcon);
         }
-    
-       
-    
-        toggleChildren(children);
+
+        BootstrapTree.toggleChildren(children);
     
         event.stopPropagation();
         $('.tree').find('.hideTreeElement').css('display', 'none');