Merge pull request #2059 from navikt/TOLK-2554

TOLK-2554 - Medtolkvarsel kan nå klikkes på for å komme inn på oppdragsdetaljer
navikt · Sep 12, 2024 · 0d51e33 · 0d51e33
2 parents 6055a2b + 1902f34
commit 0d51e33
Show file tree

Hide file tree

Showing 4 changed files with 244 additions and 119 deletions.
diff --git a/force-app/main/freelanceCommunity/classes/HOT_MyServiceAppointmentListController.cls b/force-app/main/freelanceCommunity/classes/HOT_MyServiceAppointmentListController.cls
@@ -78,12 +78,13 @@ public without sharing class HOT_MyServiceAppointmentListController {
                 HOT_ServiceTerritoryName__c,
                 HOT_TermsOfAgreement__c,
                 HOT_WorkTypeName__c,
-                HOT_Request__r.Account__r.CRM_Person__r.HOT_Gender__c, 
+                HOT_Request__r.Account__r.CRM_Person__r.HOT_Gender__c,
                 HOT_Request__r.Account__r.CRM_Person__r.CRM_AgeNumber__c,
                 SchedEndTime,
                 SchedStartTime,
                 Status,
                 Subject,
+                HOT_Interpreters__c,
                 HOT_TotalNumberOfInterpreters__c
             FROM ServiceAppointment
             WHERE Id = :recordId
@@ -195,32 +196,43 @@ public without sharing class HOT_MyServiceAppointmentListController {
         String Id = '';
         try {
             Id userId = UserInfo.getUserId();
-            List<ServiceResource> serviceResource = [SELECT Id, Name FROM ServiceResource WHERE RelatedRecordId = :userId];
-
+            List<ServiceResource> serviceResource = [
+                SELECT Id, Name
+                FROM ServiceResource
+                WHERE RelatedRecordId = :userId
+            ];
+
             HOT_InterestedResource__c interestedResource = [
-                SELECT
-                    Id, Status__c, ServiceResource__c, ServiceAppointment__c
+                SELECT Id, Status__c, ServiceResource__c, ServiceAppointment__c
                 FROM HOT_InterestedResource__c
-                WHERE
-                    ServiceResource__c IN :serviceResource AND ServiceAppointment__c=:serviceAppointmentId
+                WHERE ServiceResource__c IN :serviceResource AND ServiceAppointment__c = :serviceAppointmentId
             ];
-
-            if(interestedResource.Status__c=='Assigned'){
-                Thread__c thread = [SELECT Id FROM Thread__c WHERE CRM_Related_Object__c = :serviceAppointmentId LIMIT 1];
+
+            if (interestedResource.Status__c == 'Assigned') {
+                Thread__c thread = [
+                    SELECT Id
+                    FROM Thread__c
+                    WHERE CRM_Related_Object__c = :serviceAppointmentId
+                    LIMIT 1
+                ];
                 if (thread.Id != null) {
                     Id = thread.Id;
                     return Id;
                 }
-    
+
                 return Id;
-            }
-            else{
-                Thread__c thread = [SELECT Id FROM Thread__c WHERE CRM_Related_Object__c = :interestedResource.Id LIMIT 1];
+            } else {
+                Thread__c thread = [
+                    SELECT Id
+                    FROM Thread__c
+                    WHERE CRM_Related_Object__c = :interestedResource.Id
+                    LIMIT 1
+                ];
                 if (thread.Id != null) {
                     Id = thread.Id;
                     return Id;
                 }
-    
+
                 return Id;
             }
         } catch (Exception E) {