Merge pull request #6 from itpartnersillinois/jonker/GeneralFixes

Jonker/general fixes
itpartnersillinois · Jul 22, 2024 · 7573e91 · 7573e91
2 parents a35bf4f + 353446e
commit 7573e91
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 2 deletions.
diff --git a/Danielson.Data/PortalTranslator/FormImportInformation.cs b/Danielson.Data/PortalTranslator/FormImportInformation.cs
@@ -8,6 +8,7 @@ public class FormImportInformation {
         public string FinalScoreText { get; set; } = "";
         public string FormTemplateInternalLookupString { get; set; } = "";
         public bool IsMidterm { get; set; }
+        public DateTime LastUpdated { get; set; }
         public string PlacementType { get; set; } = "";
         public string Position { get; set; } = "";
         public string Semester { get; set; } = "";

diff --git a/Danielson/Components/Controls/ComponentItem.razor.cs b/Danielson/Components/Controls/ComponentItem.razor.cs
@@ -46,6 +46,7 @@ protected async Task SaveAnswer(int? answer, string answerText, string answerDes
             ComponentAnswer.ComponentTitle = Component.Title;
             ComponentAnswer.ComponentDescription = answerDescription;
             ComponentAnswer.DateCompleted = DateTime.Now;
+            ComponentAnswer.LastUpdated = DateTime.Now;
             ComponentAnswer.DomainItem = Component.DomainEnum;
             ComponentAnswer.QualitativeScore = answerText;
             ComponentAnswer.QuantitativeScore = answer;

diff --git a/Danielson/Components/Pages/Form/Domain.razor b/Danielson/Components/Pages/Form/Domain.razor
@@ -35,6 +35,7 @@
         }
         <DomainItem DomainAnswer="@CurrentForm.GetDomainAnswer(DomainObject.DomainEnum)" OnChangeCallback="AddDomainAnswerToForm"></DomainItem>
     </div>
+    <div>Last changed: @CurrentForm.LastUpdated.ToShortDateString() @CurrentForm.LastUpdated.ToShortTimeString()</div>
     <div class="danielson-button-footer">
         <button class="il-button il-theme-white" @onclick="ChangePagePrevious" style="float: left;">Previous</button>
         <button class="il-button il-theme-white" @onclick="ChangePageNext" style="float: right;">Next</button>
@@ -85,6 +86,7 @@
                     <input id="final-signature" aria-required="true" type="checkbox" checked="@CurrentForm.IsSigned" @onchange="CheckFinal"> <span>@FormImportInformation?.EvaluatedBy</span>
                     <p>You must sign to submit.</p>
                 </div>
+                <div>Last changed: @CurrentForm.LastUpdated.ToShortDateString() @CurrentForm.LastUpdated.ToShortTimeString()</div>
                 <div>
                     <button class="il-button il-theme-white" @onclick="SaveForm">Submit</button>
                 </div>
@@ -117,11 +119,13 @@
                     <input id="final-signature" disabled type="checkbox" checked="@CurrentForm.IsSigned"> <span>@FormImportInformation?.EvaluatedBy</span>
                     <p>You must sign to submit.</p>
                 </div>
+                <div>Last changed: @CurrentForm.LastUpdated.ToShortDateString() @CurrentForm.LastUpdated.ToShortTimeString()</div>
                 <div>
                     <button class="il-button il-theme-white" disabled @onclick="SaveForm" style="background-color: var(--il-gray-1); color: black; border: 2px solid var(--il-button-border-color);">Submit</button>
                 </div>
             }
         } else {
+            <div>Last changed: @CurrentForm.LastUpdated.ToShortDateString() @CurrentForm.LastUpdated.ToShortTimeString()</div>
             <div>
                 <button class="il-button il-theme-white" @onclick="SaveForm">Submit</button>
             </div>

diff --git a/Danielson/Components/Pages/Form/Domain.razor.cs b/Danielson/Components/Pages/Form/Domain.razor.cs
@@ -52,11 +52,20 @@ public void ChangeFormType(bool isMidterm) {
             NavigationManager.NavigateTo(NavigationManager.Uri, true);
         }
 
-        protected void AddComponentAnswerToForm(ComponentAnswer componentAnswer) => CurrentForm.AddComponentAnswerToForm(componentAnswer);
+        protected void AddComponentAnswerToForm(ComponentAnswer componentAnswer) {
+            CurrentForm.LastUpdated = DateTime.Now;
+            StateHasChanged();
+            CurrentForm.AddComponentAnswerToForm(componentAnswer);
+        }
 
-        protected void AddDomainAnswerToForm(DomainAnswer domainAnswer) => CurrentForm.AddDomainAnswerToForm(domainAnswer);
+        protected void AddDomainAnswerToForm(DomainAnswer domainAnswer) {
+            CurrentForm.LastUpdated = DateTime.Now;
+            StateHasChanged();
+            CurrentForm.AddDomainAnswerToForm(domainAnswer);
+        }
 
         protected async Task ChangePage(DomainEnum? domainEnum, bool finish) {
+            CurrentForm.LastUpdated = DateTime.Now;
             ShowFinal = finish;
             DomainObject = DomainList.Domains.First(d => d.DomainEnum == (finish ? DomainEnum.Four : domainEnum ?? DomainEnum.One));
             StateHasChanged();
@@ -167,6 +176,7 @@ protected override async Task OnInitializedAsync() {
                 CurrentForm.Title = FormImportInformation.Title;
                 CurrentForm.FinalSummary = FormImportInformation.FinalScoreText;
                 CurrentForm.DateEvaluated = FormImportInformation.DateEvaluated;
+                CurrentForm.LastUpdated = FormImportInformation.LastUpdated;
             }
             CurrentFormTemplate = await FormTemplateAccess.Get(FormImportInformation.FormTemplateInternalLookupString);
             FinalAnswers = FinalAnswerGenerator.GetFinalAnswers(CurrentForm);
@@ -175,6 +185,7 @@ protected override async Task OnInitializedAsync() {
         }
 
         protected async Task SaveForm() {
+            CurrentForm.LastUpdated = DateTime.Now;
             _ = await ComponentAnswerHandler.Save(CurrentForm);
             var username = (await AuthenticationStateProvider.GetAuthenticationStateAsync()).User.Identity?.Name ?? "";
             _ = await FormImport.Save(CurrentForm, username);