CU-868a5nz1n Fixing error in ViewCallEx call.

Author: ucswift

Web/Resgrid.Web/Areas/User/Controllers/DispatchController.cs

@@ -1371,12 +1371,12 @@ public async Task<IActionResult> CallExportEx(string query)
 				var model = new CallExportView();
 				model.Call = await _callsService.PopulateCallData(call, true, true, true, true, true, true, true, true, true);
 				model.CallLogs = await _workLogsService.GetCallLogsForCallAsync(call.CallId);
-				model.Department = await _departmentsService.GetDepartmentByIdAsync(model.Call.DepartmentId, false);
-				model.UnitStates = (await _unitsService.GetUnitStatesForCallAsync(model.Call.DepartmentId, call.CallId)).OrderBy(x => x.UnitId).OrderBy(y => y.Timestamp).ToList();
-				model.ActionLogs = (await _actionLogsService.GetActionLogsForCallAsync(model.Call.DepartmentId, call.CallId)).OrderBy(x => x.UserId).OrderBy(y => y.Timestamp).ToList();
-				model.Groups = await _departmentGroupsService.GetAllGroupsForDepartmentAsync(model.Call.DepartmentId);
-				model.Units = await _unitsService.GetUnitsForDepartmentAsync(DepartmentId);
-				model.Names = await _departmentsService.GetAllPersonnelNamesForDepartmentAsync(DepartmentId);
+				model.Department = await _departmentsService.GetDepartmentByIdAsync(call.DepartmentId, false);
+				model.UnitStates = (await _unitsService.GetUnitStatesForCallAsync(call.DepartmentId, call.CallId)).OrderBy(x => x.UnitId).OrderBy(y => y.Timestamp).ToList();
+				model.ActionLogs = (await _actionLogsService.GetActionLogsForCallAsync(call.DepartmentId, call.CallId)).OrderBy(x => x.UserId).OrderBy(y => y.Timestamp).ToList();
+				model.Groups = await _departmentGroupsService.GetAllGroupsForDepartmentAsync(call.DepartmentId);
+				model.Units = await _unitsService.GetUnitsForDepartmentAsync(call.DepartmentId);
+				model.Names = await _departmentsService.GetAllPersonnelNamesForDepartmentAsync(call.DepartmentId);
 				model.ChildCalls = await _callsService.GetChildCallsForCallAsync(call.CallId);
 				model.Contacts = await _contactsService.GetAllContactsForDepartmentAsync(DepartmentId);
 
@@ -1400,11 +1400,14 @@ public async Task<IActionResult> CallExportEx(string query)
 				var model = new CallExportView();
 				model.Call = await _callsService.PopulateCallData(call, true, true, true, true, true, true, true, true, true);
 				model.CallLogs = await _workLogsService.GetCallLogsForCallAsync(call.CallId);
-				model.Department = await _departmentsService.GetDepartmentByIdAsync(model.Call.DepartmentId, false);
-				model.UnitStates = (await _unitsService.GetUnitStatesForCallAsync(model.Call.DepartmentId, call.CallId)).OrderBy(x => x.UnitId).OrderBy(y => y.Timestamp).ToList();
-				model.ActionLogs = (await _actionLogsService.GetActionLogsForCallAsync(model.Call.DepartmentId, call.CallId)).OrderBy(x => x.UserId).OrderBy(y => y.Timestamp).ToList();
-				model.Groups = await _departmentGroupsService.GetAllGroupsForDepartmentAsync(model.Call.DepartmentId);
-				model.Units = await _unitsService.GetUnitsForDepartmentAsync(model.Call.DepartmentId);
+				model.Department = await _departmentsService.GetDepartmentByIdAsync(call.DepartmentId, false);
+				model.UnitStates = (await _unitsService.GetUnitStatesForCallAsync(call.DepartmentId, call.CallId)).OrderBy(x => x.UnitId).OrderBy(y => y.Timestamp).ToList();
+				model.ActionLogs = (await _actionLogsService.GetActionLogsForCallAsync(call.DepartmentId, call.CallId)).OrderBy(x => x.UserId).OrderBy(y => y.Timestamp).ToList();
+				model.Groups = await _departmentGroupsService.GetAllGroupsForDepartmentAsync(call.DepartmentId);
+				model.Units = await _unitsService.GetUnitsForDepartmentAsync(call.DepartmentId);
+				model.Names = await _departmentsService.GetAllPersonnelNamesForDepartmentAsync(call.DepartmentId);
+				model.ChildCalls = await _callsService.GetChildCallsForCallAsync(call.CallId);
+				model.Contacts = await _contactsService.GetAllContactsForDepartmentAsync(DepartmentId);
 
 				if (!String.IsNullOrWhiteSpace(items[2]) && items[2] != "0")
 				{

Web/Resgrid.Web/Areas/User/Views/Dispatch/CallExportEx.cshtml

@@ -311,7 +311,7 @@
                 <div style="border: 1px solid #ddd; padding: 10px;">@Html.Raw(Model.Call.CompletedNotes)</div>
             </div>
         </div>
-         <div class="row">
+        <div class="row">
             <div class="col-xs-12">
                 <strong><small>@commonLocalizer["Notes"]</small></strong>
                 <table class="table table-condensed table-bordered">
@@ -323,15 +323,29 @@
                         </tr>
                     </thead>
                     <tbody>
-                        @foreach (var note in Model.Call.CallNotes)
+                        @if (Model.Call.CallNotes == null || !Model.Call.CallNotes.Any() || Model.Names == null || !Model.Names.Any())
                         {
-                            var name = Model.Names.FirstOrDefault(x => x.UserId == note.UserId);
                             <tr>
-                                <td>@note.Timestamp.TimeConverterToString(Model.Department)</td>
-                                <td>@name.FirstName @name.LastName</td>
-                                <td>@note.Note</td>
+                                <td colspan="3">@localizer["NoCallNotes"]</td>
                             </tr>
+                        }
+                        else
+                        {
+                            @foreach (var note in Model.Call.CallNotes)
+                            {
+                                PersonName personName = null;
+                                personName = Model.Names.FirstOrDefault(x => x.UserId == note.UserId);
+
+                                if (personName == null)
+                                    personName = new PersonName() { UserId = note.UserId, FirstName = "", LastName = "" };
 
+                                <tr>
+                                    <td>@note.Timestamp.TimeConverterToString(Model.Department)</td>
+                                    <td>@personName.FirstName @personName.LastName</td>
+                                    <td>@note.Note</td>
+                                </tr>
+
+                            }
                         }
                     </tbody>
                 </table>
@@ -518,7 +532,7 @@
                                     </tr>
                                 </tbody>
                             </table>
-                            <img style="max-width:600px;" src="@Url.Action("GetCallImage", "Dispatch", new {Area = "User", callId = img.CallId, attachmentId = img.CallAttachmentId})" />
+                            <img style="max-width:600px;" src="@Url.Action("GetCallImage", "Dispatch", new { Area = "User", callId = img.CallId, attachmentId = img.CallAttachmentId })" />
                         </div>
                     </div>
                 }