From 7db1231a342cd77e122637470bdaea687fc08e2f Mon Sep 17 00:00:00 2001 From: Edvard Brekke Date: Tue, 1 Oct 2024 08:35:19 +0200 Subject: [PATCH 01/14] Update HOT_Request_Record_Page.flexipage-meta.xml --- ...HOT_Request_Record_Page.flexipage-meta.xml | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/force-app/main/default/flexipages/HOT_Request_Record_Page.flexipage-meta.xml b/force-app/main/default/flexipages/HOT_Request_Record_Page.flexipage-meta.xml index 809625f99e..81fd28f3ea 100644 --- a/force-app/main/default/flexipages/HOT_Request_Record_Page.flexipage-meta.xml +++ b/force-app/main/default/flexipages/HOT_Request_Record_Page.flexipage-meta.xml @@ -445,6 +445,13 @@ Record.UserPersonNumber__c RecordUserPersonNumber__cField + + + {!Record.Person__r.INT_Confidential__c} + EQUAL + UGRADERT + + Facet-44bd0420-e99e-4568-9aab-a8594fd390cc @@ -459,6 +466,13 @@ Record.UserEmail__c RecordUserEmail__cField + + + {!Record.Person__r.INT_Confidential__c} + EQUAL + UGRADERT + + @@ -469,6 +483,13 @@ Record.UserPhone__c RecordUserPhone__cField + + + {!Record.Person__r.INT_Confidential__c} + EQUAL + UGRADERT + + @@ -479,6 +500,13 @@ Record.UserName__c RecordUserName__cField + + + {!Record.Person__r.INT_Confidential__c} + EQUAL + UGRADERT + + From cbdc73991bac665d352c5b319bd6f384c75dfc05 Mon Sep 17 00:00:00 2001 From: Edvard Brekke Date: Tue, 1 Oct 2024 10:44:18 +0200 Subject: [PATCH 02/14] Update Service_Appointment_Record_Page.flexipage-meta.xml --- ...Appointment_Record_Page.flexipage-meta.xml | 874 +++++++++++++++++- 1 file changed, 872 insertions(+), 2 deletions(-) diff --git a/force-app/main/default/flexipages/Service_Appointment_Record_Page.flexipage-meta.xml b/force-app/main/default/flexipages/Service_Appointment_Record_Page.flexipage-meta.xml index a0dbb08133..9b6daf0913 100644 --- a/force-app/main/default/flexipages/Service_Appointment_Record_Page.flexipage-meta.xml +++ b/force-app/main/default/flexipages/Service_Appointment_Record_Page.flexipage-meta.xml @@ -136,10 +136,880 @@ Facet + + + + uiBehavior + required + + Record.AppointmentNumber + RecordAppointmentNumberField + + + + + + uiBehavior + readonly + + Record.HOT_WorkOrder__c + RecordHOT_WorkOrder_cField + + + + + + uiBehavior + required + + Record.ParentRecordId + RecordParentRecordIdField + + + + + + uiBehavior + required + + Record.HOT_Request__c + RecordHOT_Request_cField + + + + + + uiBehavior + none + + Record.Subject + RecordSubjectField + + + + + + uiBehavior + none + + Record.Description + RecordDescriptionField + + + + + + uiBehavior + readonly + + Record.ContactId + RecordContactIdField + + + + + + uiBehavior + readonly + + Record.AccountId + RecordAccountIdField + + + + + + uiBehavior + readonly + + Record.HOT_NavEmployeeName__c + RecordHOT_NavEmployeeName_cField + + + + + + uiBehavior + readonly + + Record.HOT_AssignmentType__c + RecordHOT_AssignmentType_cField + + + + + + uiBehavior + readonly + + Record.HOT_HapticCommunication__c + RecordHOT_HapticCommunication_cField + + + + + + uiBehavior + readonly + + Record.HOT_IsOtherEconomicProvicer__c + RecordHOT_IsOtherEconomicProvicer_cField + + + + + + uiBehavior + readonly + + Record.HOT_TotalNumberOfInterpreters__c + RecordHOT_TotalNumberOfInterpreters_cField + + + + + + uiBehavior + readonly + + Record.HOT_GenderAge__c + RecordHOT_GenderAge_cField + + + + + + uiBehavior + none + + Record.HOT_AutoDispatch__c + RecordHOT_AutoDispatch_cField + + + + + + uiBehavior + none + + Record.HOT_Company__c + RecordHOT_Company_cField + + + Facet-518575a4-e422-4ef9-9367-accdfba4479c + Facet + + + + + + uiBehavior + none + + Record.OwnerId + RecordOwnerIdField + + + + + + uiBehavior + required + + Record.ServiceTerritoryId + RecordServiceTerritoryIdField + + + + + + uiBehavior + required + + Record.Status + RecordStatusField + + + + + + uiBehavior + none + + Record.HOT_IsUrgent__c + RecordHOT_IsUrgent_cField + + + + + + uiBehavior + none + + Record.HOT_DispatcherNew__c + RecordHOT_DispatcherNew_cField + + + + + + uiBehavior + none + + Record.HOT_CancelComment__c + RecordHOT_CancelComment_cField + + + + + + uiBehavior + readonly + + Record.HOT_CanceledByInterpreter__c + RecordHOT_CanceledByInterpreter_cField + + + + + + uiBehavior + readonly + + Record.HOT_IsAcute__c + RecordHOT_IsAcute_cField + + + + + + uiBehavior + readonly + + Record.HOT_DegreeOfHearingAndVisualImpairment__c + RecordHOT_DegreeOfHearingAndVisualImpairment_cField + + + + + + uiBehavior + none + + Record.HOT_IsScreenInterpreterNew__c + RecordHOT_IsScreenInterpreterNew_cField + + + + + + uiBehavior + readonly + + Record.HOT_IsImageInterpreter__c + RecordHOT_IsImageInterpreter_cField + + + + + + uiBehavior + none + + Record.HOT_PreferredResource__c + RecordHOT_PreferredResource_cField + + + Facet-01567e86-8b38-42c8-80ea-2ac6d1717480 + Facet + + + + + + body + Facet-518575a4-e422-4ef9-9367-accdfba4479c + + flexipage:column + flexipage_column + + + + + + body + Facet-01567e86-8b38-42c8-80ea-2ac6d1717480 + + flexipage:column + flexipage_column2 + + + Facet-534834f4-e046-4e35-92c2-6ebf4fd43f19 + Facet + + + + + + uiBehavior + readonly + + Record.HOT_DayOfWeek__c + RecordHOT_DayOfWeek_cField + + + + + + uiBehavior + none + + Record.SchedStartTime + RecordSchedStartTimeField + + + + + + uiBehavior + none + + Record.SchedEndTime + RecordSchedEndTimeField + + + Facet-3b63ae24-cf30-438d-bec2-68096ccfe34d + Facet + + + + + + uiBehavior + none + + Record.Duration + RecordDurationField + + + + + + uiBehavior + none + + Record.DurationType + RecordDurationTypeField + + + Facet-a1a43699-b133-4f87-b460-3b6d12b75a63 + Facet + + + + + + body + Facet-3b63ae24-cf30-438d-bec2-68096ccfe34d + + flexipage:column + flexipage_column3 + + + + + + body + Facet-a1a43699-b133-4f87-b460-3b6d12b75a63 + + flexipage:column + flexipage_column4 + + + Facet-2d8f2694-6f2f-487c-8c55-ff358683f5a7 + Facet + + + + + + uiBehavior + none + + Record.ActualStartTime + RecordActualStartTimeField + + + + + + uiBehavior + none + + Record.ActualEndTime + RecordActualEndTimeField + + + Facet-8bde9480-133a-4fb2-ba60-b812b90bb403 + Facet + + + + + + uiBehavior + none + + Record.ActualDuration + RecordActualDurationField + + + Facet-119f6239-3db8-46cf-a4d3-d594e7b8dccd + Facet + + + + + + body + Facet-8bde9480-133a-4fb2-ba60-b812b90bb403 + + flexipage:column + flexipage_column5 + + + + + + body + Facet-119f6239-3db8-46cf-a4d3-d594e7b8dccd + + flexipage:column + flexipage_column6 + + + Facet-cdd44b7c-96aa-48b2-84e4-c45a3922293c + Facet + + + + + + uiBehavior + none + + Record.Address + RecordAddressField + + + + + + uiBehavior + none + + Record.HOT_InterpretationStreet__c + RecordHOT_InterpretationStreet_cField + + + + + + uiBehavior + none + + Record.HOT_InterpretationPostalCode__c + RecordHOT_InterpretationPostalCode_cField + + + + + + uiBehavior + none + + Record.HOT_InterpretationPostalCity__c + RecordHOT_InterpretationPostalCity_cField + + + Facet-597d6c64-2422-4bb4-8ede-4c86ac3dc6ea + Facet + + + + + + body + Facet-597d6c64-2422-4bb4-8ede-4c86ac3dc6ea + + flexipage:column + flexipage_column7 + + + Facet-37211abc-4072-4061-8e0f-ebc18d2f9bd4 + Facet + + + + + + uiBehavior + readonly + + Record.HOT_IsReleasedToFreelance__c + RecordHOT_IsReleasedToFreelance_cField + + + + + + uiBehavior + none + + Record.HOT_DeadlineDate__c + RecordHOT_DeadlineDate_cField + + + + + + uiBehavior + none + + Record.HOT_FreelanceSubject__c + RecordHOT_FreelanceSubject_cField + + + + + + uiBehavior + readonly + + Record.HOT_ReleasedBy__c + RecordHOT_ReleasedBy_cField + + + + + + uiBehavior + readonly + + Record.HOT_ReleaseDate__c + RecordHOT_ReleaseDate_cField + + + Facet-545f6e1d-03e8-431e-abdb-b5d2e7b05410 + Facet + + + + + + uiBehavior + none + + Record.HOT_Processed__c + RecordHOT_Processed_cField + + + Facet-495efc2a-442b-41b5-b529-053335dfaf54 + Facet + + + + + + body + Facet-545f6e1d-03e8-431e-abdb-b5d2e7b05410 + + flexipage:column + flexipage_column8 + + + + + + body + Facet-495efc2a-442b-41b5-b529-053335dfaf54 + + flexipage:column + flexipage_column9 + + + Facet-a4f64947-aff6-406c-8753-535bb1eb272c + Facet + + + + + + uiBehavior + readonly + + Record.CreatedById + RecordCreatedByIdField + + + {!Record.CreatedBy.Contact.Account.Name} + NE + SKJERMET + + + + + Facet-237332e6-c9c6-4439-b45e-9bd30c4e87ea + Facet + + + + + + uiBehavior + readonly + + Record.LastModifiedById + RecordLastModifiedByIdField + + + {!Record.CreatedBy.Contact.Account.Name} + NE + SKJERMET + + + + + Facet-ff90f31c-de78-4f31-8b5e-ea658916ec99 + Facet + + + + + + body + Facet-237332e6-c9c6-4439-b45e-9bd30c4e87ea + + flexipage:column + flexipage_column10 + + + + + + body + Facet-ff90f31c-de78-4f31-8b5e-ea658916ec99 + + flexipage:column + flexipage_column11 + + + Facet-93b46736-e5d1-430d-802c-3579e5683e70 + Facet + + + + + + uiBehavior + required + + Record.EarliestStartTime + RecordEarliestStartTimeField + + + + + + uiBehavior + required + + Record.DueDate + RecordDueDateField + + + Facet-c432c073-6ff4-4920-ac0c-507bb98ac8bf + Facet + + + + + + uiBehavior + none + + Record.ArrivalWindowStartTime + RecordArrivalWindowStartTimeField + + + + + + uiBehavior + none + + Record.ArrivalWindowEndTime + RecordArrivalWindowEndTimeField + + + Facet-e6ae328e-9536-4d70-8b56-a9b41a0c8f83 + Facet + + + + + + body + Facet-c432c073-6ff4-4920-ac0c-507bb98ac8bf + + flexipage:column + flexipage_column12 + + + + + + body + Facet-e6ae328e-9536-4d70-8b56-a9b41a0c8f83 + + flexipage:column + flexipage_column13 + + + Facet-ebec4acc-48e3-4a17-a127-eb8cd8223ae8 + Facet + + + + + + columns + Facet-534834f4-e046-4e35-92c2-6ebf4fd43f19 + + + horizontalAlignment + false + + + label + General Information + + flexipage:fieldSection + flexipage_fieldSection + + + + + + columns + Facet-2d8f2694-6f2f-487c-8c55-ff358683f5a7 + + + horizontalAlignment + false + + + label + Scheduled Times + + flexipage:fieldSection + flexipage_fieldSection2 + + + + + + columns + Facet-cdd44b7c-96aa-48b2-84e4-c45a3922293c + + + horizontalAlignment + false + + + label + Actual Times + + flexipage:fieldSection + flexipage_fieldSection3 + + + + + + columns + Facet-37211abc-4072-4061-8e0f-ebc18d2f9bd4 + + + horizontalAlignment + false + + + label + Address + + flexipage:fieldSection + flexipage_fieldSection4 + + + + + + columns + Facet-a4f64947-aff6-406c-8753-535bb1eb272c + + + horizontalAlignment + false + + + label + Frilanstolk + + flexipage:fieldSection + flexipage_fieldSection5 + + + + + + columns + Facet-93b46736-e5d1-430d-802c-3579e5683e70 + + + horizontalAlignment + false + + + label + System Information + + flexipage:fieldSection + flexipage_fieldSection6 + + + + + + columns + Facet-ebec4acc-48e3-4a17-a127-eb8cd8223ae8 + + + horizontalAlignment + false + + + label + Time Constraints + + flexipage:fieldSection + flexipage_fieldSection7 + + - force:detailPanel - force_detailPanel + force:recordDetailPanelMobile + force_recordDetailPanelMobile Facet-df264a6f-fc90-439f-8c6b-7b055633aa86 From e4236cc3b10ec6da6ca88969c9d04b639b2e69f3 Mon Sep 17 00:00:00 2001 From: Edvard Brekke Date: Tue, 1 Oct 2024 11:58:24 +0200 Subject: [PATCH 03/14] Page layouts --- ...dmin Person Account Layout.layout-meta.xml | 33 ++++++++----------- ...-HOT Person Account Layout.layout-meta.xml | 21 +++--------- ...Tolk Person Account Layout.layout-meta.xml | 14 +++----- 3 files changed, 21 insertions(+), 47 deletions(-) diff --git a/force-app/main/default/layouts/PersonAccount-HOT Admin Person Account Layout.layout-meta.xml b/force-app/main/default/layouts/PersonAccount-HOT Admin Person Account Layout.layout-meta.xml index a036daef08..d46a02611c 100644 --- a/force-app/main/default/layouts/PersonAccount-HOT Admin Person Account Layout.layout-meta.xml +++ b/force-app/main/default/layouts/PersonAccount-HOT Admin Person Account Layout.layout-meta.xml @@ -1,8 +1,6 @@ - DataDotComAccountInsights - DataDotComClean - DataDotComCompanyHierarchy + OpenSlackRecordChannel Submit false @@ -19,12 +17,7 @@ CRM_NavEmployeeName__c - - - Edit - INT_PersonIdent__c - - + @@ -74,6 +67,16 @@ Record + + Edit + StandardButton + 0 + + + Delete + StandardButton + 1 + Account.HOT_SendSMS QuickAction @@ -104,16 +107,6 @@ StandardButton 7 - - Edit - StandardButton - 0 - - - Delete - StandardButton - 1 - @@ -167,7 +160,7 @@ false false - 00h1l000001g86k + 00hKF000003jyYL 4 0 Default diff --git a/force-app/main/default/layouts/PersonAccount-HOT Person Account Layout.layout-meta.xml b/force-app/main/default/layouts/PersonAccount-HOT Person Account Layout.layout-meta.xml index 57fe0add05..e7097f9900 100644 --- a/force-app/main/default/layouts/PersonAccount-HOT Person Account Layout.layout-meta.xml +++ b/force-app/main/default/layouts/PersonAccount-HOT Person Account Layout.layout-meta.xml @@ -4,8 +4,7 @@ ChangeRecordType CreateCallList CreateSurveyInvitation - DataDotComAccountInsights - DataDotComCompanyHierarchy + DataDotComClean Delete DisableCustomerPortalAccount Edit @@ -14,6 +13,7 @@ IsotopeSubscription LoginToNetworkAsPersonUser LoginToPortalAsPersonUser + OpenSlackRecordChannel PartnerScorecard PrintableView Share @@ -31,25 +31,12 @@ Required Name - - Edit - PersonMobilePhone - - - Edit - PersonEmail - Edit CRM_NavEmployeeName__c - - - Edit - INT_PersonIdent__c - - + @@ -162,7 +149,7 @@ false false - 00h1l000001g86l + 00hKF000003jyYM 4 0 Default diff --git a/force-app/main/default/layouts/PersonAccount-HOT Tolk Person Account Layout.layout-meta.xml b/force-app/main/default/layouts/PersonAccount-HOT Tolk Person Account Layout.layout-meta.xml index 63f0a937a4..8c41ff6c7c 100644 --- a/force-app/main/default/layouts/PersonAccount-HOT Tolk Person Account Layout.layout-meta.xml +++ b/force-app/main/default/layouts/PersonAccount-HOT Tolk Person Account Layout.layout-meta.xml @@ -4,7 +4,8 @@ ChangeRecordType CreateCallList CreateSurveyInvitation - DataDotComClean + DataDotComAccountInsights + DataDotComCompanyHierarchy Delete DisableCustomerPortalAccount Edit @@ -13,6 +14,7 @@ IsotopeSubscription LoginToNetworkAsPersonUser LoginToPortalAsPersonUser + OpenSlackRecordChannel PartnerScorecard PrintableView Share @@ -30,14 +32,6 @@ Required Name - - Edit - PersonMobilePhone - - - Edit - PersonEmail - Edit CRM_NavEmployeeName__c @@ -146,7 +140,7 @@ false false - 00h1l000001g86m + 00hKF000003jyYN 4 0 Default From 7ada561dff1d88a7c5ca8bb041f28fc289526ea3 Mon Sep 17 00:00:00 2001 From: Edvard Brekke Date: Tue, 1 Oct 2024 12:07:48 +0200 Subject: [PATCH 04/14] Update HOT_Request_Record_Page.flexipage-meta.xml --- .../HOT_Request_Record_Page.flexipage-meta.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/force-app/main/default/flexipages/HOT_Request_Record_Page.flexipage-meta.xml b/force-app/main/default/flexipages/HOT_Request_Record_Page.flexipage-meta.xml index 81fd28f3ea..58aa1cd704 100644 --- a/force-app/main/default/flexipages/HOT_Request_Record_Page.flexipage-meta.xml +++ b/force-app/main/default/flexipages/HOT_Request_Record_Page.flexipage-meta.xml @@ -1050,6 +1050,13 @@ Record.CreatedById RecordCreatedByIdField + + + {!Record.Account__r.CRM_Person__r.INT_Confidential__c} + EQUAL + UGRADERT + + Facet-14ddce80-1f48-4abd-bb89-754ed88ec359 @@ -1064,6 +1071,13 @@ Record.LastModifiedById RecordLastModifiedByIdField + + + {!Record.Account__r.CRM_Person__r.INT_Confidential__c} + EQUAL + UGRADERT + + Facet-da78511c-5540-4d3b-a8b9-c2cbc1a79bdb From ae010adbbcaab23fb854894a7de9b7c7fb117b02 Mon Sep 17 00:00:00 2001 From: Edvard Brekke Date: Tue, 1 Oct 2024 12:31:23 +0200 Subject: [PATCH 05/14] Update Person__c.Update_Person.quickAction-meta.xml --- .../Person__c.Update_Person.quickAction-meta.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/force-app/main/default/quickActions/Person__c.Update_Person.quickAction-meta.xml b/force-app/main/default/quickActions/Person__c.Update_Person.quickAction-meta.xml index 8dc8f98696..c5f0377f3f 100644 --- a/force-app/main/default/quickActions/Person__c.Update_Person.quickAction-meta.xml +++ b/force-app/main/default/quickActions/Person__c.Update_Person.quickAction-meta.xml @@ -4,6 +4,11 @@ TwoColumnsLeftToRight + + false + CRM_FullName__c + Readonly + false INT_KrrMobilePhone__c From 5c8fd2d395aff40ec96f68ec4c5de73e3c99876e Mon Sep 17 00:00:00 2001 From: Edvard Brekke Date: Tue, 1 Oct 2024 12:38:51 +0200 Subject: [PATCH 06/14] prettier --- ...HOT_Request_Record_Page.flexipage-meta.xml | 2 +- ...Appointment_Record_Page.flexipage-meta.xml | 19 ++++++++------ ...dmin Person Account Layout.layout-meta.xml | 26 +++++++++---------- ...-HOT Person Account Layout.layout-meta.xml | 26 +++++++++---------- ...Tolk Person Account Layout.layout-meta.xml | 26 +++++++++---------- ...rson__c.Update_Person.quickAction-meta.xml | 2 +- 6 files changed, 52 insertions(+), 49 deletions(-) diff --git a/force-app/main/default/flexipages/HOT_Request_Record_Page.flexipage-meta.xml b/force-app/main/default/flexipages/HOT_Request_Record_Page.flexipage-meta.xml index 58aa1cd704..b6f3cbf60b 100644 --- a/force-app/main/default/flexipages/HOT_Request_Record_Page.flexipage-meta.xml +++ b/force-app/main/default/flexipages/HOT_Request_Record_Page.flexipage-meta.xml @@ -1671,4 +1671,4 @@ flexipage:recordHomeTemplateDesktop RecordPage - + \ No newline at end of file diff --git a/force-app/main/default/flexipages/Service_Appointment_Record_Page.flexipage-meta.xml b/force-app/main/default/flexipages/Service_Appointment_Record_Page.flexipage-meta.xml index 9b6daf0913..921832594f 100644 --- a/force-app/main/default/flexipages/Service_Appointment_Record_Page.flexipage-meta.xml +++ b/force-app/main/default/flexipages/Service_Appointment_Record_Page.flexipage-meta.xml @@ -25,7 +25,8 @@ Released to Freelance - {!$Permission.CustomPermission.HOT_ReleaseToFreelance} + + {!$Permission.CustomPermission.HOT_ReleaseToFreelance} EQUAL true @@ -41,7 +42,8 @@ Released to Freelance - {!$Permission.CustomPermission.HOT_ReleaseToFreelance} + + {!$Permission.CustomPermission.HOT_ReleaseToFreelance} EQUAL true @@ -61,7 +63,8 @@ ServiceAppointment.HOT_ChangeStatus - {!$Permission.StandardPermission.FieldServiceMobileApp} + + {!$Permission.StandardPermission.FieldServiceMobileApp} EQUAL true @@ -202,8 +205,8 @@ uiBehavior readonly - Record.ContactId - RecordContactIdField + Record.AccountId + RecordAccountIdField @@ -212,8 +215,8 @@ uiBehavior readonly - Record.AccountId - RecordAccountIdField + Record.ContactId + RecordContactIdField @@ -1322,4 +1325,4 @@ flexipage:recordHomeTemplateDesktop RecordPage - + \ No newline at end of file diff --git a/force-app/main/default/layouts/PersonAccount-HOT Admin Person Account Layout.layout-meta.xml b/force-app/main/default/layouts/PersonAccount-HOT Admin Person Account Layout.layout-meta.xml index d46a02611c..f0700aa0c7 100644 --- a/force-app/main/default/layouts/PersonAccount-HOT Admin Person Account Layout.layout-meta.xml +++ b/force-app/main/default/layouts/PersonAccount-HOT Admin Person Account Layout.layout-meta.xml @@ -17,7 +17,7 @@ CRM_NavEmployeeName__c - + @@ -25,8 +25,8 @@ true true - - + + @@ -34,7 +34,7 @@ false false - + @@ -42,8 +42,8 @@ true false - - + + @@ -51,8 +51,8 @@ true true - - + + @@ -60,9 +60,9 @@ true false - - - + + + @@ -108,7 +108,7 @@ 7 - + NAME Status__c @@ -165,4 +165,4 @@ 0 Default - + \ No newline at end of file diff --git a/force-app/main/default/layouts/PersonAccount-HOT Person Account Layout.layout-meta.xml b/force-app/main/default/layouts/PersonAccount-HOT Person Account Layout.layout-meta.xml index e7097f9900..fa06302af2 100644 --- a/force-app/main/default/layouts/PersonAccount-HOT Person Account Layout.layout-meta.xml +++ b/force-app/main/default/layouts/PersonAccount-HOT Person Account Layout.layout-meta.xml @@ -36,7 +36,7 @@ CRM_NavEmployeeName__c - + @@ -44,8 +44,8 @@ true true - - + + @@ -53,7 +53,7 @@ false false - + @@ -61,8 +61,8 @@ true false - - + + @@ -70,8 +70,8 @@ true true - - + + @@ -79,9 +79,9 @@ true false - - - + + + @@ -97,7 +97,7 @@ 1 - + NAME Status__c @@ -154,4 +154,4 @@ 0 Default - + \ No newline at end of file diff --git a/force-app/main/default/layouts/PersonAccount-HOT Tolk Person Account Layout.layout-meta.xml b/force-app/main/default/layouts/PersonAccount-HOT Tolk Person Account Layout.layout-meta.xml index 8c41ff6c7c..b35ea25650 100644 --- a/force-app/main/default/layouts/PersonAccount-HOT Tolk Person Account Layout.layout-meta.xml +++ b/force-app/main/default/layouts/PersonAccount-HOT Tolk Person Account Layout.layout-meta.xml @@ -37,7 +37,7 @@ CRM_NavEmployeeName__c - + @@ -45,8 +45,8 @@ true true - - + + @@ -54,7 +54,7 @@ false false - + @@ -62,8 +62,8 @@ true false - - + + @@ -71,8 +71,8 @@ true true - - + + @@ -80,15 +80,15 @@ true false - - - + + + Record - + NAME Status__c @@ -145,4 +145,4 @@ 0 Default - + \ No newline at end of file diff --git a/force-app/main/default/quickActions/Person__c.Update_Person.quickAction-meta.xml b/force-app/main/default/quickActions/Person__c.Update_Person.quickAction-meta.xml index c5f0377f3f..772effe318 100644 --- a/force-app/main/default/quickActions/Person__c.Update_Person.quickAction-meta.xml +++ b/force-app/main/default/quickActions/Person__c.Update_Person.quickAction-meta.xml @@ -153,4 +153,4 @@ Update Update - + \ No newline at end of file From 4c2d13cd5b9783653c3d8b9ecd94c52404857b5a Mon Sep 17 00:00:00 2001 From: Edvard Brekke Date: Tue, 8 Oct 2024 12:52:20 +0200 Subject: [PATCH 07/14] Update Service_Appointment_Record_Page.flexipage-meta.xml --- .../Service_Appointment_Record_Page.flexipage-meta.xml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/force-app/main/default/flexipages/Service_Appointment_Record_Page.flexipage-meta.xml b/force-app/main/default/flexipages/Service_Appointment_Record_Page.flexipage-meta.xml index 921832594f..68fb70b4b0 100644 --- a/force-app/main/default/flexipages/Service_Appointment_Record_Page.flexipage-meta.xml +++ b/force-app/main/default/flexipages/Service_Appointment_Record_Page.flexipage-meta.xml @@ -25,8 +25,7 @@ Released to Freelance - - {!$Permission.CustomPermission.HOT_ReleaseToFreelance} + {!$Permission.CustomPermission.HOT_ReleaseToFreelance} EQUAL true @@ -42,8 +41,7 @@ Released to Freelance - - {!$Permission.CustomPermission.HOT_ReleaseToFreelance} + {!$Permission.CustomPermission.HOT_ReleaseToFreelance} EQUAL true @@ -1325,4 +1323,4 @@ flexipage:recordHomeTemplateDesktop RecordPage - \ No newline at end of file + From 648a1437a4d64b2f1d473c311b5e495dbccaa7df Mon Sep 17 00:00:00 2001 From: Edvard Brekke Date: Tue, 8 Oct 2024 13:23:30 +0200 Subject: [PATCH 08/14] Update Service_Appointment_Record_Page.flexipage-meta.xml --- .../Service_Appointment_Record_Page.flexipage-meta.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/force-app/main/default/flexipages/Service_Appointment_Record_Page.flexipage-meta.xml b/force-app/main/default/flexipages/Service_Appointment_Record_Page.flexipage-meta.xml index 68fb70b4b0..4e45b73815 100644 --- a/force-app/main/default/flexipages/Service_Appointment_Record_Page.flexipage-meta.xml +++ b/force-app/main/default/flexipages/Service_Appointment_Record_Page.flexipage-meta.xml @@ -61,8 +61,7 @@ ServiceAppointment.HOT_ChangeStatus - - {!$Permission.StandardPermission.FieldServiceMobileApp} + {!$Permission.StandardPermission.FieldServiceMobileApp} EQUAL true From 8747f26e041ee40c45499c9952fcadb12bb4f85e Mon Sep 17 00:00:00 2001 From: Edvard Brekke Date: Mon, 14 Oct 2024 13:59:28 +0200 Subject: [PATCH 09/14] Update NavEmployeeNameAccount__c.field-meta.xml --- .../fields/NavEmployeeNameAccount__c.field-meta.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/force-app/main/default/objects/HOT_Request__c/fields/NavEmployeeNameAccount__c.field-meta.xml b/force-app/main/default/objects/HOT_Request__c/fields/NavEmployeeNameAccount__c.field-meta.xml index cb3a0830a3..5d120bd25a 100644 --- a/force-app/main/default/objects/HOT_Request__c/fields/NavEmployeeNameAccount__c.field-meta.xml +++ b/force-app/main/default/objects/HOT_Request__c/fields/NavEmployeeNameAccount__c.field-meta.xml @@ -1,8 +1,9 @@ NavEmployeeNameAccount__c + false false - IF($Permission.CRM_NavEmployees, Account__r.CRM_NavEmployeeName__c, "") + IF($Permission.CRM_NavEmployees, Person__r.CRM_FullName__c , "") BlankAsZero false From 7421a5f7dcf081ea97ea7a7728987f944e3198ef Mon Sep 17 00:00:00 2001 From: Edvard Brekke Date: Tue, 15 Oct 2024 11:49:44 +0200 Subject: [PATCH 10/14] NavEmployeeNameAccount__c henter navn fra Person --- .../fields/NavEmployeeNameAccount__c.field-meta.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/force-app/main/default/objects/HOT_Request__c/fields/NavEmployeeNameAccount__c.field-meta.xml b/force-app/main/default/objects/HOT_Request__c/fields/NavEmployeeNameAccount__c.field-meta.xml index 5d120bd25a..7bfe59bc33 100644 --- a/force-app/main/default/objects/HOT_Request__c/fields/NavEmployeeNameAccount__c.field-meta.xml +++ b/force-app/main/default/objects/HOT_Request__c/fields/NavEmployeeNameAccount__c.field-meta.xml @@ -3,12 +3,12 @@ NavEmployeeNameAccount__c false false - IF($Permission.CRM_NavEmployees, Person__r.CRM_FullName__c , "") + IF($Permission.CRM_NavEmployees, Person__r.CRM_FullName__c , "") BlankAsZero - + false false false Text false - + \ No newline at end of file From 459f5c0a1a8a1b97b4f7572e421d8be4ca6647aa Mon Sep 17 00:00:00 2001 From: Edvard Brekke Date: Tue, 15 Oct 2024 12:01:09 +0200 Subject: [PATCH 11/14] =?UTF-8?q?HOT=5FNavEmployeeName=5F=5Fc=20p=C3=A5=20?= =?UTF-8?q?SA=20henter=20navn=20fra=20person?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fields/HOT_NavEmployeeName__c.field-meta.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/force-app/main/default/objects/ServiceAppointment/fields/HOT_NavEmployeeName__c.field-meta.xml b/force-app/main/default/objects/ServiceAppointment/fields/HOT_NavEmployeeName__c.field-meta.xml index ba8b2b6425..8da6e2a0dd 100644 --- a/force-app/main/default/objects/ServiceAppointment/fields/HOT_NavEmployeeName__c.field-meta.xml +++ b/force-app/main/default/objects/ServiceAppointment/fields/HOT_NavEmployeeName__c.field-meta.xml @@ -1,8 +1,9 @@ HOT_NavEmployeeName__c + false false - IF($Permission.CRM_NavEmployees || CONTAINS(HOT_AssignedResourceId__c,$User.Id), Account.CRM_NavEmployeeName__c, "") + IF($Permission.CRM_NavEmployees || CONTAINS(HOT_AssignedResourceId__c,$User.Id), Account.CRM_Person__r.CRM_FullName__c , "") BlankAsZero false From 95f172bebe20a218646ae46799fbb4546fefa7de Mon Sep 17 00:00:00 2001 From: Edvard Brekke Date: Tue, 15 Oct 2024 12:14:58 +0200 Subject: [PATCH 12/14] Skjuler sist endret av/opprettet av dersom person er !ugradert --- .../flexipages/HOT_Request_Record_Page.flexipage-meta.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/force-app/main/default/flexipages/HOT_Request_Record_Page.flexipage-meta.xml b/force-app/main/default/flexipages/HOT_Request_Record_Page.flexipage-meta.xml index b6f3cbf60b..a5b70b4130 100644 --- a/force-app/main/default/flexipages/HOT_Request_Record_Page.flexipage-meta.xml +++ b/force-app/main/default/flexipages/HOT_Request_Record_Page.flexipage-meta.xml @@ -1052,7 +1052,7 @@ RecordCreatedByIdField - {!Record.Account__r.CRM_Person__r.INT_Confidential__c} + {!Record.CreatedBy.Contact.Account.CRM_Person__r.INT_Confidential__c} EQUAL UGRADERT @@ -1073,7 +1073,7 @@ RecordLastModifiedByIdField - {!Record.Account__r.CRM_Person__r.INT_Confidential__c} + {!Record.LastModifiedBy.Contact.Account.CRM_Person__r.INT_Confidential__c} EQUAL UGRADERT @@ -1671,4 +1671,4 @@ flexipage:recordHomeTemplateDesktop RecordPage - \ No newline at end of file + From 84b05c97b302a2eb5cfbdf5e0449f5105fbd5df1 Mon Sep 17 00:00:00 2001 From: Edvard Brekke Date: Tue, 15 Oct 2024 13:21:10 +0200 Subject: [PATCH 13/14] Lagt til skjermet brukers navn i SAdetails for frilanstol --- .../HOT_Tolk_Frilans.permissionset-meta.xml | 7 ++++++- .../HOT_MyServiceAppointmentListController.cls | 1 + .../lwc/hot_informationModal/hot_informationModal.js | 11 ++++++++++- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/force-app/main/default/permissionsets/HOT_Tolk_Frilans.permissionset-meta.xml b/force-app/main/default/permissionsets/HOT_Tolk_Frilans.permissionset-meta.xml index 7b2c18f346..5ccfd1a7b1 100644 --- a/force-app/main/default/permissionsets/HOT_Tolk_Frilans.permissionset-meta.xml +++ b/force-app/main/default/permissionsets/HOT_Tolk_Frilans.permissionset-meta.xml @@ -637,6 +637,11 @@ Person__c.INT_KrrEmail__c true + + false + Person__c.INT_Confidential__c + true + false Person__c.INT_KrrMobilePhone__c @@ -1710,4 +1715,4 @@ true UseWebLink - + \ No newline at end of file diff --git a/force-app/main/freelanceCommunity/classes/HOT_MyServiceAppointmentListController.cls b/force-app/main/freelanceCommunity/classes/HOT_MyServiceAppointmentListController.cls index 40a0459228..e1f9078917 100644 --- a/force-app/main/freelanceCommunity/classes/HOT_MyServiceAppointmentListController.cls +++ b/force-app/main/freelanceCommunity/classes/HOT_MyServiceAppointmentListController.cls @@ -156,6 +156,7 @@ public without sharing class HOT_MyServiceAppointmentListController { HOT_Request__r.Account__r.CRM_Person__r.HOT_Gender__c, HOT_Request__r.Account__r.CRM_Person__r.CRM_AgeNumber__c, HOT_Request__r.OwnerName__c, + HOT_NavEmployeeName__c, HOT_ServiceTerritoryName__c, HOT_TermsOfAgreement__c, HOT_TotalNumberOfInterpreters__c, diff --git a/force-app/main/freelanceCommunity/classes/lwc/hot_informationModal/hot_informationModal.js b/force-app/main/freelanceCommunity/classes/lwc/hot_informationModal/hot_informationModal.js index 12e9d43861..84f1f9e289 100644 --- a/force-app/main/freelanceCommunity/classes/lwc/hot_informationModal/hot_informationModal.js +++ b/force-app/main/freelanceCommunity/classes/lwc/hot_informationModal/hot_informationModal.js @@ -200,10 +200,19 @@ export default class Hot_informationModal extends NavigationMixin(LightningEleme if ( this.serviceAppointment && this.serviceAppointment.HOT_Request__r && - this.serviceAppointment.HOT_Request__r.Account__r + this.serviceAppointment.HOT_Request__r.Account__r && + this.serviceAppointment.HOT_Request__r.Account__r.CRM_Person__r.INT_Confidential == 'UGRADERT' ) { this.accountName = this.serviceAppointment.HOT_Request__r.Account__r.Name; } + if ( + this.serviceAppointment && + this.serviceAppointment.HOT_Request__r && + this.serviceAppointment.HOT_Request__r.Account__r && + this.serviceAppointment.HOT_Request__r.Account__r.CRM_Person__r.INT_Confidential != 'FORTROLIG' + ) { + this.accountName = this.serviceAppointment.HOT_NavEmployeeName__c; + } if (this.serviceAppointment && this.serviceAppointment.HOT_Request__r) { this.ownerName = this.serviceAppointment.HOT_Request__r.OwnerName__c; } From fa60ad960163930b7f9bbe8d5132ada343a6ddd0 Mon Sep 17 00:00:00 2001 From: Edvard Brekke Date: Tue, 5 Nov 2024 10:17:49 +0100 Subject: [PATCH 14/14] Update Service_Appointment_Record_Page.flexipage-meta.xml --- ...Appointment_Record_Page.flexipage-meta.xml | 238 ++++++------------ 1 file changed, 74 insertions(+), 164 deletions(-) diff --git a/force-app/main/default/flexipages/Service_Appointment_Record_Page.flexipage-meta.xml b/force-app/main/default/flexipages/Service_Appointment_Record_Page.flexipage-meta.xml index 4e45b73815..053d62836c 100644 --- a/force-app/main/default/flexipages/Service_Appointment_Record_Page.flexipage-meta.xml +++ b/force-app/main/default/flexipages/Service_Appointment_Record_Page.flexipage-meta.xml @@ -146,6 +146,16 @@ RecordAppointmentNumberField + + + + uiBehavior + required + + Record.HOT_Request__c + RecordHOT_Request_cField + + @@ -170,10 +180,10 @@ uiBehavior - required + none - Record.HOT_Request__c - RecordHOT_Request_cField + Record.Subject + RecordSubjectField @@ -182,8 +192,8 @@ uiBehavior none - Record.Subject - RecordSubjectField + Record.Description + RecordDescriptionField @@ -192,8 +202,8 @@ uiBehavior none - Record.Description - RecordDescriptionField + Record.HOT_Interpreters__c + RecordHOT_Interpreters_cField @@ -232,18 +242,18 @@ uiBehavior readonly - Record.HOT_AssignmentType__c - RecordHOT_AssignmentType_cField + Record.HOT_GenderAge__c + RecordHOT_GenderAge_cField uiBehavior - readonly + none - Record.HOT_HapticCommunication__c - RecordHOT_HapticCommunication_cField + Record.WorkTypeId + RecordWorkTypeIdField @@ -252,8 +262,8 @@ uiBehavior readonly - Record.HOT_IsOtherEconomicProvicer__c - RecordHOT_IsOtherEconomicProvicer_cField + Record.HOT_AssignmentType__c + RecordHOT_AssignmentType_cField @@ -262,8 +272,18 @@ uiBehavior readonly - Record.HOT_TotalNumberOfInterpreters__c - RecordHOT_TotalNumberOfInterpreters_cField + Record.HOT_HapticCommunication__c + RecordHOT_HapticCommunication_cField + + + + + + uiBehavior + none + + Record.HOT_IsSerieoppdrag__c + RecordHOT_IsSerieoppdrag_cField @@ -272,28 +292,28 @@ uiBehavior readonly - Record.HOT_GenderAge__c - RecordHOT_GenderAge_cField + Record.HOT_IsOtherEconomicProvicer__c + RecordHOT_IsOtherEconomicProvicer_cField uiBehavior - none + readonly - Record.HOT_AutoDispatch__c - RecordHOT_AutoDispatch_cField + Record.HOT_IsImageInterpreter__c + RecordHOT_IsImageInterpreter_cField uiBehavior - none + readonly - Record.HOT_Company__c - RecordHOT_Company_cField + Record.HOT_TotalNumberOfInterpreters__c + RecordHOT_TotalNumberOfInterpreters_cField Facet-518575a4-e422-4ef9-9367-accdfba4479c @@ -324,20 +344,20 @@ uiBehavior - required + none - Record.Status - RecordStatusField + Record.HOT_DispatcherNew__c + RecordHOT_DispatcherNew_cField uiBehavior - none + required - Record.HOT_IsUrgent__c - RecordHOT_IsUrgent_cField + Record.Status + RecordStatusField @@ -346,8 +366,8 @@ uiBehavior none - Record.HOT_DispatcherNew__c - RecordHOT_DispatcherNew_cField + Record.HOT_IsUrgent__c + RecordHOT_IsUrgent_cField @@ -370,16 +390,6 @@ RecordHOT_CanceledByInterpreter_cField - - - - uiBehavior - readonly - - Record.HOT_IsAcute__c - RecordHOT_IsAcute_cField - - @@ -406,8 +416,8 @@ uiBehavior readonly - Record.HOT_IsImageInterpreter__c - RecordHOT_IsImageInterpreter_cField + Record.HOT_IsAcute__c + RecordHOT_IsAcute_cField @@ -452,33 +462,23 @@ uiBehavior - readonly - - Record.HOT_DayOfWeek__c - RecordHOT_DayOfWeek_cField - - - - - - uiBehavior - none + required - Record.SchedStartTime - RecordSchedStartTimeField + Record.EarliestStartTime + RecordEarliestStartTimeField uiBehavior - none + required - Record.SchedEndTime - RecordSchedEndTimeField + Record.DueDate + RecordDueDateField - Facet-3b63ae24-cf30-438d-bec2-68096ccfe34d + Facet-c432c073-6ff4-4920-ac0c-507bb98ac8bf Facet @@ -488,8 +488,8 @@ uiBehavior none - Record.Duration - RecordDurationField + Record.ArrivalWindowStartTime + RecordArrivalWindowStartTimeField @@ -498,11 +498,11 @@ uiBehavior none - Record.DurationType - RecordDurationTypeField + Record.ArrivalWindowEndTime + RecordArrivalWindowEndTimeField - Facet-a1a43699-b133-4f87-b460-3b6d12b75a63 + Facet-e6ae328e-9536-4d70-8b56-a9b41a0c8f83 Facet @@ -510,23 +510,23 @@ body - Facet-3b63ae24-cf30-438d-bec2-68096ccfe34d + Facet-c432c073-6ff4-4920-ac0c-507bb98ac8bf flexipage:column - flexipage_column3 + flexipage_column12 body - Facet-a1a43699-b133-4f87-b460-3b6d12b75a63 + Facet-e6ae328e-9536-4d70-8b56-a9b41a0c8f83 flexipage:column - flexipage_column4 + flexipage_column13 - Facet-2d8f2694-6f2f-487c-8c55-ff358683f5a7 + Facet-ebec4acc-48e3-4a17-a127-eb8cd8223ae8 Facet @@ -807,78 +807,6 @@ Facet-93b46736-e5d1-430d-802c-3579e5683e70 Facet - - - - - uiBehavior - required - - Record.EarliestStartTime - RecordEarliestStartTimeField - - - - - - uiBehavior - required - - Record.DueDate - RecordDueDateField - - - Facet-c432c073-6ff4-4920-ac0c-507bb98ac8bf - Facet - - - - - - uiBehavior - none - - Record.ArrivalWindowStartTime - RecordArrivalWindowStartTimeField - - - - - - uiBehavior - none - - Record.ArrivalWindowEndTime - RecordArrivalWindowEndTimeField - - - Facet-e6ae328e-9536-4d70-8b56-a9b41a0c8f83 - Facet - - - - - - body - Facet-c432c073-6ff4-4920-ac0c-507bb98ac8bf - - flexipage:column - flexipage_column12 - - - - - - body - Facet-e6ae328e-9536-4d70-8b56-a9b41a0c8f83 - - flexipage:column - flexipage_column13 - - - Facet-ebec4acc-48e3-4a17-a127-eb8cd8223ae8 - Facet - @@ -902,7 +830,7 @@ columns - Facet-2d8f2694-6f2f-487c-8c55-ff358683f5a7 + Facet-ebec4acc-48e3-4a17-a127-eb8cd8223ae8 horizontalAlignment @@ -910,10 +838,10 @@ label - Scheduled Times + Time Constraints flexipage:fieldSection - flexipage_fieldSection2 + flexipage_fieldSection7 @@ -988,24 +916,6 @@ flexipage_fieldSection6 - - - - columns - Facet-ebec4acc-48e3-4a17-a127-eb8cd8223ae8 - - - horizontalAlignment - false - - - label - Time Constraints - - flexipage:fieldSection - flexipage_fieldSection7 - - force:recordDetailPanelMobile