updated the concept view and edit pages to show the code system of th…

…e reference term(s)
MohawkMEDIC · Jan 16, 2018 · bd6c1d4 · bd6c1d4
1 parent 9b5b1b4
commit bd6c1d4
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 20 deletions.
diff --git a/OpenIZAdmin/Models/ReferenceTermModels/ReferenceTermViewModel.cs b/OpenIZAdmin/Models/ReferenceTermModels/ReferenceTermViewModel.cs
@@ -49,6 +49,7 @@ public ReferenceTermViewModel()
  public ReferenceTermViewModel(ReferenceTerm referenceTerm) : this()
  {
  this.CreationTime = referenceTerm.CreationTime.DateTime;
+ this.CodeSystem = referenceTerm.CodeSystem?.Oid;
  this.DisplayNames = referenceTerm.DisplayNames;
  this.Id = referenceTerm.Key.Value;
  this.Mnemonic = referenceTerm.Mnemonic;
@@ -75,7 +76,14 @@ public ReferenceTermViewModel(Concept concept)
  }
 
  /// <summary>
- /// Gets or sets the concept identifier associated with the reference term
+ /// Gets or sets the code system.
+ /// </summary>
+ /// <value>The code system.</value>
+ [Display(Name = "CodeSystem", ResourceType = typeof(Locale))]
+ public string CodeSystem { get; set; }
+
+ /// <summary>
+ /// Gets or sets the concept identifier associated with the reference term.
  /// </summary>
  public Guid? ConceptId { get; set; }
 

diff --git a/OpenIZAdmin/Views/Concept/Edit.cshtml b/OpenIZAdmin/Views/Concept/Edit.cshtml
@@ -146,6 +146,7 @@
  { "orderable": false }, 
  null,
  null,
+ null,
  { "orderable": false }
  ]
  });

diff --git a/OpenIZAdmin/Views/Concept/ViewConcept.cshtml b/OpenIZAdmin/Views/Concept/ViewConcept.cshtml
@@ -94,6 +94,7 @@
  columns: [
  { "orderable": false },
  null,
+ null,
  null
  ]
  });

diff --git a/OpenIZAdmin/Views/Shared/_ManageReferenceTermsPartial.cshtml b/OpenIZAdmin/Views/Shared/_ManageReferenceTermsPartial.cshtml
@@ -7,40 +7,42 @@
 
  @if (Model.Any())
  {
- <table class="table table-striped table-bordered" id="referenceTermsTable"> 
+ <table class="table table-striped table-bordered" id="referenceTermsTable">
  <thead>
- <tr>
- <th></th>
- <th>@Html.DisplayNameFor(m => m.Mnemonic)</th>
- <th>@Html.DisplayNameFor(m => m.Names)</th> 
- <th></th>
- </tr>
+ <tr>
+ <th></th>
+ <th>@Html.DisplayNameFor(m => m.Mnemonic)</th>
+ <th>@Html.DisplayNameFor(m => m.Names)</th>
+ <th>@Html.DisplayNameFor(m => m.CodeSystem)</th>
+ <th></th>
+ </tr>
  </thead>
  <tbody>
  @foreach (var referenceTerm in Model)
  {
  <tr>
  <td class="centerContent autoFitContents"><span class="glyphicon glyphicon-list" aria-hidden="true"></span></td>
  <td>@referenceTerm.Mnemonic</td>
- <td>@referenceTerm.Names</td> 
+ <td>@referenceTerm.Names</td>
+ <td>@referenceTerm.CodeSystem</td>
  <td class="autoFitContents centerContent">
  <a class="btn btn-warning" href="@Url.Action("Edit", "ReferenceTerm", new { id = referenceTerm.Id })">
  @Locale.Edit
  <span class="glyphicon glyphicon-pencil"></span>
  </a>
- @using (Html.BeginForm("DeleteReferenceTerm", "Concept", new {id = referenceTerm.ConceptId, versionId = referenceTerm.ConceptVersionKey, refTermId = referenceTerm.Id}, FormMethod.Post, new {@class = "inlineForm form-horizontal", role = "form"}))
+ @using (Html.BeginForm("DeleteReferenceTerm", "Concept", new { id = referenceTerm.ConceptId, versionId = referenceTerm.ConceptVersionKey, refTermId = referenceTerm.Id }, FormMethod.Post, new { @class = "inlineForm form-horizontal", role = "form" }))
  {
  @Html.AntiForgeryToken()
 
  <button type="submit" data-wait-text="@Locale.PleaseWait" class="btn btn-danger">
  @Locale.Delete
  <span class="glyphicon glyphicon-remove"></span>
  </button>
- }
+}
  </td>
 
  </tr>
- }
+}
  </tbody>
  </table>
  }

diff --git a/OpenIZAdmin/Views/Shared/_ReferenceTermsPartial.cshtml b/OpenIZAdmin/Views/Shared/_ReferenceTermsPartial.cshtml
@@ -10,23 +10,25 @@
 
  @if (Model.Any())
  {
- <table class="table table-striped table-bordered" id="referenceTermsTable"> 
+ <table class="table table-striped table-bordered" id="referenceTermsTable">
  <thead>
- <tr>
- <th></th>
- <th>@Html.DisplayNameFor(m => m.Mnemonic)</th>
- <th>@Html.DisplayNameFor(m => m.Names)</th> 
- </tr>
+ <tr>
+ <th></th>
+ <th>@Html.DisplayNameFor(m => m.Mnemonic)</th>
+ <th>@Html.DisplayNameFor(m => m.Names)</th>
+ <th>@Html.DisplayNameFor(m => m.CodeSystem)</th>
+ </tr>
  </thead>
  <tbody>
  @foreach (var referenceTerm in Model)
  {
  <tr>
  <td class="centerContent autoFitContents"><span class="glyphicon glyphicon-list" aria-hidden="true"></span></td>
  <td>@referenceTerm.Mnemonic</td>
- <td>@referenceTerm.Names</td> 
+ <td>@referenceTerm.Names</td>
+ <td>@referenceTerm.CodeSystem</td>
  </tr>
- }
+}
  </tbody>
  </table>
  }