Permet de filtrer les organismes avec le nom

Issue: #199894 Change-Id: I989b1afe0c20da71b0e1f0e4f3db99d6a53b25a6
atolcd · Dec 18, 2023 · 34a3282 · 34a3282
1 parent 2ae6d97
commit 34a3282
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 9 deletions.
diff --git a/remocra/src/main/java/fr/sdis83/remocra/service/OrganismeService.java b/remocra/src/main/java/fr/sdis83/remocra/service/OrganismeService.java
@@ -40,7 +40,8 @@ protected Predicate processFilterItem(
     if ("id".equals(itemFilter.getFieldName())) {
       Expression<String> cpPath = from.get("id");
       predicat = cBuilder.equal(cpPath, itemFilter.getValue());
-    } else if ("query".equals(itemFilter.getFieldName())) {
+    } else if ("query".equals(itemFilter.getFieldName())
+        || "nom".equals(itemFilter.getFieldName())) {
       Expression<String> cpPath = from.get("nom");
       predicat =
           cBuilder.like(cBuilder.upper(cpPath), "%" + itemFilter.getValue().toUpperCase() + "%");

diff --git a/remocra/src/main/java/fr/sdis83/remocra/web/OrganismeController.java b/remocra/src/main/java/fr/sdis83/remocra/web/OrganismeController.java
@@ -6,6 +6,8 @@
 import fr.sdis83.remocra.repository.ContactRepository;
 import fr.sdis83.remocra.service.OrganismeService;
 import fr.sdis83.remocra.util.ExceptionUtils;
+import fr.sdis83.remocra.web.message.ItemFilter;
+import fr.sdis83.remocra.web.message.ItemSorting;
 import fr.sdis83.remocra.web.serialize.ext.AbstractExtListSerializer;
 import fr.sdis83.remocra.web.serialize.ext.AbstractExtObjectSerializer;
 import fr.sdis83.remocra.web.serialize.ext.SuccessErrorExtSerializer;
@@ -41,11 +43,31 @@ protected OrganismeService getService() {
     return service;
   }
 
-  @Override
-  protected JSONSerializer additionnalIncludeExclude(JSONSerializer serializer) {
-    return serializer
-        .include("data.organismeParent.id", "data.organismeParent.code", "data.organismeParent.nom")
-        .exclude("data.zoneCompetence.geometrie", "data.organismeParent.*");
+  @RequestMapping(value = "", method = RequestMethod.GET, headers = "Accept=application/json")
+  @PreAuthorize("isAuthenticated()")
+  public ResponseEntity<java.lang.String> listJson(
+      @RequestParam(value = "page", required = false) Integer page,
+      final @RequestParam(value = "start", required = false) Integer start,
+      final @RequestParam(value = "limit", required = false) Integer limit,
+      @RequestParam(value = "sort", required = false) String sorts,
+      @RequestParam(value = "filter", required = false) String filters) {
+    final List<ItemSorting> sortList = ItemSorting.decodeJson(sorts);
+    final List<ItemFilter> itemFilterList = ItemFilter.decodeJson(filters);
+    return new AbstractExtListSerializer<Organisme>("Organisme retrieved.") {
+
+      @Override
+      protected JSONSerializer additionnalIncludeExclude(JSONSerializer serializer) {
+        return serializer
+            .include(
+                "data.organismeParent.id", "data.organismeParent.code", "data.organismeParent.nom")
+            .exclude("data.zoneCompetence.geometrie", "data.organismeParent.*", "");
+      }
+
+      @Override
+      protected List<Organisme> getRecords() {
+        return getService().find(start, limit, sortList, itemFilterList);
+      }
+    }.serialize();
   }
 
   @RequestMapping(value = "", method = RequestMethod.POST, headers = "Accept=application/json")

diff --git a/remocra/src/main/webapp/js/app/remocra/features/admin/typereference/OrganismeGrid.js b/remocra/src/main/webapp/js/app/remocra/features/admin/typereference/OrganismeGrid.js
@@ -24,16 +24,37 @@ Ext.define('Sdis.Remocra.features.admin.typereference.OrganismeGrid', {
     uniqueConstraints: ['code'],
     modelType: 'Sdis.Remocra.model.Organisme',
     store: null, // créé à la construction
+    plugins: [
+        Sdis.Remocra.widget.WidgetFactory.createRoweditingPluginCfg(false),
+        Ext.create('Ext.ux.grid.plugin.HeaderFilters')
+ ],
 
     constructor: function(config) {
         config = config || {};
+        var deferredApplyFilter = Ext.Function.createBuffered(function() {
+            this.headerFilterPlugin.applyFilters();
+        }, 600, this);
 
         // Ajout des définitions des colonnes si elles ne sont pas déjà définies
         var typeRefGridCols = Sdis.Remocra.features.admin.typereference.TypeReferenceGrid.columns;
         Ext.applyIf(config, {
             columns: [
                 typeRefGridCols.code,
-                typeRefGridCols.nom,
+                {
+                    header : 'Nom',
+                    dataIndex : 'nom',
+                    menuDisabled : true,
+                    flex: 5,
+                    filterable: true,
+                    filter: {
+                        xtype: 'textfield',
+                        hideTrigger: true,
+                        listeners: {
+                            change: deferredApplyFilter
+                        }
+                    },
+                    editor: {xtype: 'textfield'}
+                },
                 this.statics().columns.emailContact,
                 {
                     header: 'Type Organisme',

diff --git a/remocra/src/main/webapp/js/app/remocra/store/Organisme.js b/remocra/src/main/webapp/js/app/remocra/store/Organisme.js
@@ -10,6 +10,6 @@ Ext.define('Sdis.Remocra.store.Organisme', {
     remoteFilter: true,
     pageSize: 20,
 
-    autoLoad : false,
-    autoSync: false
+    autoLoad : true,
+    autoSync: true
 });