fixed place type search concept filters and dropdowns

MohawkMEDIC · Feb 7, 2018 · f34fcc9 · f34fcc9
1 parent 9990972
commit f34fcc9
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 0 deletions.
diff --git a/OpenIZAdmin.Services/Entities/Places/IPlaceConceptService.cs b/OpenIZAdmin.Services/Entities/Places/IPlaceConceptService.cs
@@ -32,5 +32,11 @@ public interface IPlaceConceptService
  /// </summary>
  /// <returns>Returns a list of place type concepts.</returns>
  IEnumerable<Concept> GetPlaceTypeConcepts();
+
+ /// <summary>
+ /// Gets the place sub type concepts.
+ /// </summary>
+ /// <returns>Returns a list of place type subconcepts.</returns>
+ IEnumerable<Concept> GetPlaceSubTypeConcepts();
  }
 }
diff --git a/OpenIZAdmin.Services/Entities/Places/PlaceConceptService.cs b/OpenIZAdmin.Services/Entities/Places/PlaceConceptService.cs
@@ -60,5 +60,14 @@ public IEnumerable<Concept> GetPlaceTypeConcepts()
  {
  return this.cacheService.Get("PlaceTypeConcept", () => this.conceptService.GetConceptsByConceptSetMnemonic("PlaceTypeConcept"));
  }
+
+ /// <summary>
+ /// Gets the place sub type concepts.
+ /// </summary>
+ /// <returns>Returns a list of place type subconcepts.</returns>
+ public IEnumerable<Concept> GetPlaceSubTypeConcepts()
+ {
+ return this.cacheService.Get("PlaceTypes", () => this.conceptService.GetConceptsByConceptSetMnemonic("PlaceTypes"));
+ }
  }
 }
diff --git a/OpenIZAdmin/Controllers/PlaceController.cs b/OpenIZAdmin/Controllers/PlaceController.cs
@@ -357,6 +357,9 @@ public ActionResult Create()
  // get the place type concepts
  model.TypeConcepts.AddRange(this.placeConceptService.GetPlaceTypeConcepts().ToSelectList(this.HttpContext.GetCurrentLanguage()).ToList());
 
+ // get the place types sub concepts
+ model.TypeConcepts.AddRange(this.placeConceptService.GetPlaceSubTypeConcepts().ToSelectList(this.HttpContext.GetCurrentLanguage()).ToList());
+
  // order the type concept list
  model.TypeConcepts = model.TypeConcepts.OrderBy(c => c.Text).ToList();
  }
@@ -428,6 +431,9 @@ public ActionResult Create(CreatePlaceModel model)
  // get the place type concepts
  model.TypeConcepts.AddRange(this.placeConceptService.GetPlaceTypeConcepts().ToSelectList(this.HttpContext.GetCurrentLanguage()).ToList());
 
+ // get the place types sub concepts
+ model.TypeConcepts.AddRange(this.placeConceptService.GetPlaceSubTypeConcepts().ToSelectList(this.HttpContext.GetCurrentLanguage()).ToList());
+
  // order the type concept list
  model.TypeConcepts = model.TypeConcepts.OrderBy(c => c.Text).ToList();
 
@@ -677,6 +683,9 @@ public ActionResult Edit(Guid id, Guid? versionId)
  // get the place type concepts
  model.TypeConcepts.AddRange(this.placeConceptService.GetPlaceTypeConcepts().ToSelectList(this.HttpContext.GetCurrentLanguage(), c => c.Key == place.TypeConceptKey).ToList());
 
+ // get the place types sub concepts
+ model.TypeConcepts.AddRange(this.placeConceptService.GetPlaceSubTypeConcepts().ToSelectList(this.HttpContext.GetCurrentLanguage(), c => c.Key == place.TypeConceptKey).ToList());
+
  // order the type concept list
  model.TypeConcepts = model.TypeConcepts.OrderBy(c => c.Text).ToList();
 
@@ -738,6 +747,9 @@ public ActionResult Edit(EditPlaceModel model)
  // get the place type concepts
  model.TypeConcepts.AddRange(this.placeConceptService.GetPlaceTypeConcepts().ToSelectList(this.HttpContext.GetCurrentLanguage(), c => c.Key == place.TypeConceptKey).ToList());
 
+ // get the place types sub concepts
+ model.TypeConcepts.AddRange(this.placeConceptService.GetPlaceSubTypeConcepts().ToSelectList(this.HttpContext.GetCurrentLanguage(), c => c.Key == place.TypeConceptKey).ToList());
+
  // order the type concept list
  model.TypeConcepts = model.TypeConcepts.OrderBy(c => c.Text).ToList();
 
@@ -865,6 +877,9 @@ public ActionResult Index()
  // get the place type concepts
  typeFilter.AddRange(this.placeConceptService.GetPlaceTypeConcepts().ToSelectList(this.HttpContext.GetCurrentLanguage()).ToList());
 
+ // get the place types sub concepts
+ typeFilter.AddRange(this.placeConceptService.GetPlaceSubTypeConcepts().ToSelectList(this.HttpContext.GetCurrentLanguage()).ToList());
+
  // order the type concept list
  typeFilter = typeFilter.OrderBy(c => c.Text).ToList();
  }