Merge branch 'master' of https://labs.maarch.org/maarch/archivesCourrier

presentation/maarchRM/Resources/view/archivesCourrier/list.html

@@ -46,11 +46,14 @@
                             <span>
                                 <?merge .startDate.format('d-m-Y') ?> au <?merge .endDate.format('d-m-Y') ?>
                             </span>
-                            <?merge .descriptionLevel.ifeq('RecordGrp').not() ?>
+                            <?merge .descriptionLevel.ifeq('File') ?>
+                            <span>
+                                <?merge .sentDate.format('d-m-Y') ?>
+                            </span>
+                            <?merge .descriptionLevel.ifeq('Item') ?>
                             <span>
                                 <?merge .sentDate.format('d-m-Y') ?>
                             </span>
-
                         </td>
                         <td><?merge .originator ?></td>
                         <td>

presentation/maarchRM/Resources/view/archivesCourrier/search.html

@@ -61,13 +61,13 @@
                                 </div>
                                 <div class="form-group">
                                     <label class="col-sm-4 control-label">Type d'objet</label>
-                                    <div class="btn-group col-sm-6" data-toggle="buttons">
-                                        <label class="btn btn-info active" title="Archive">
-                                            <input type="radio" name="hasParent" value="0" checked/> Archive
-                                        </label>
-                                        <label class="btn btn-default" title="Objet d'archive">
-                                            <input type="radio" name="hasParent" value="1"/> Objet
-                                        </label>
+                                    <div class="col-sm-6">
+                                        <select class="form-control" name="descriptionLevel">
+                                            <option value=""></option>
+                                            <option value="RecordGrp">Groupe</option>
+                                            <option value="File">Dossier</option>
+                                            <option value="Item">Document</option>
+                                        </select>
                                     </div>
                                 </div>
                             </div>

presentation/maarchRM/UserStory/archiveRetrieval/IndexCourrierInterface.php

@@ -40,7 +40,7 @@ interface IndexCourrierInterface
      * Recherche d'une liste d'archives
      * @param string $query
      * @param string $originatorOrgRegNumber
-     * @param bool $hasParent
+     * @param string $descriptionLevel
      * @param date $dateFrom
      * @param date $dateTo
      *
@@ -52,6 +52,6 @@ interface IndexCourrierInterface
         $dateTo,
         $query,
         $originatorOrgRegNumber,
-        $hasParent
+        $descriptionLevel
     );
 }
\ No newline at end of file