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..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 @@ -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 + + @@ -1022,6 +1050,13 @@ Record.CreatedById RecordCreatedByIdField + + + {!Record.CreatedBy.Contact.Account.CRM_Person__r.INT_Confidential__c} + EQUAL + UGRADERT + + Facet-14ddce80-1f48-4abd-bb89-754ed88ec359 @@ -1036,6 +1071,13 @@ Record.LastModifiedById RecordLastModifiedByIdField + + + {!Record.LastModifiedBy.Contact.Account.CRM_Person__r.INT_Confidential__c} + EQUAL + UGRADERT + + Facet-da78511c-5540-4d3b-a8b9-c2cbc1a79bdb 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..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 @@ -136,10 +136,790 @@ Facet + + + + uiBehavior + required + + Record.AppointmentNumber + RecordAppointmentNumberField + + + + + + uiBehavior + required + + Record.HOT_Request__c + RecordHOT_Request_cField + + + + + + uiBehavior + readonly + + Record.HOT_WorkOrder__c + RecordHOT_WorkOrder_cField + + + + + + uiBehavior + required + + Record.ParentRecordId + RecordParentRecordIdField + + + + + + uiBehavior + none + + Record.Subject + RecordSubjectField + + + + + + uiBehavior + none + + Record.Description + RecordDescriptionField + + + + + + uiBehavior + none + + Record.HOT_Interpreters__c + RecordHOT_Interpreters_cField + + + + + + uiBehavior + readonly + + Record.AccountId + RecordAccountIdField + + + + + + uiBehavior + readonly + + Record.ContactId + RecordContactIdField + + + + + + uiBehavior + readonly + + Record.HOT_NavEmployeeName__c + RecordHOT_NavEmployeeName_cField + + + + + + uiBehavior + readonly + + Record.HOT_GenderAge__c + RecordHOT_GenderAge_cField + + + + + + uiBehavior + none + + Record.WorkTypeId + RecordWorkTypeIdField + + + + + + uiBehavior + readonly + + Record.HOT_AssignmentType__c + RecordHOT_AssignmentType_cField + + + + + + uiBehavior + readonly + + Record.HOT_HapticCommunication__c + RecordHOT_HapticCommunication_cField + + + + + + uiBehavior + none + + Record.HOT_IsSerieoppdrag__c + RecordHOT_IsSerieoppdrag_cField + + + + + + uiBehavior + readonly + + Record.HOT_IsOtherEconomicProvicer__c + RecordHOT_IsOtherEconomicProvicer_cField + + + + + + uiBehavior + readonly + + Record.HOT_IsImageInterpreter__c + RecordHOT_IsImageInterpreter_cField + + + + + + uiBehavior + readonly + + Record.HOT_TotalNumberOfInterpreters__c + RecordHOT_TotalNumberOfInterpreters_cField + + + Facet-518575a4-e422-4ef9-9367-accdfba4479c + Facet + + + + + + uiBehavior + none + + Record.OwnerId + RecordOwnerIdField + + + + + + uiBehavior + required + + Record.ServiceTerritoryId + RecordServiceTerritoryIdField + + + + + + uiBehavior + none + + Record.HOT_DispatcherNew__c + RecordHOT_DispatcherNew_cField + + + + + + uiBehavior + required + + Record.Status + RecordStatusField + + + + + + uiBehavior + none + + Record.HOT_IsUrgent__c + RecordHOT_IsUrgent_cField + + + + + + uiBehavior + none + + Record.HOT_CancelComment__c + RecordHOT_CancelComment_cField + + + + + + uiBehavior + readonly + + Record.HOT_CanceledByInterpreter__c + RecordHOT_CanceledByInterpreter_cField + + + + + + uiBehavior + readonly + + Record.HOT_DegreeOfHearingAndVisualImpairment__c + RecordHOT_DegreeOfHearingAndVisualImpairment_cField + + + + + + uiBehavior + none + + Record.HOT_IsScreenInterpreterNew__c + RecordHOT_IsScreenInterpreterNew_cField + + + + + + uiBehavior + readonly + + Record.HOT_IsAcute__c + RecordHOT_IsAcute_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 + 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 + + + + + + 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 + + + + + + columns + Facet-534834f4-e046-4e35-92c2-6ebf4fd43f19 + + + horizontalAlignment + false + + + label + General Information + + flexipage:fieldSection + flexipage_fieldSection + + + + + + columns + Facet-ebec4acc-48e3-4a17-a127-eb8cd8223ae8 + + + horizontalAlignment + false + + + label + Time Constraints + + flexipage:fieldSection + flexipage_fieldSection7 + + + + + + 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 + + - force:detailPanel - force_detailPanel + force:recordDetailPanelMobile + force_recordDetailPanelMobile Facet-df264a6f-fc90-439f-8c6b-7b055633aa86 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 174efc3960..7eea6997af 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 - @@ -168,9 +161,9 @@ false false - 00hKO0000010Urb + 00hKF000003jyYL 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 57fe0add05..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 @@ -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 - - + @@ -57,8 +44,8 @@ true true - - + + @@ -66,7 +53,7 @@ false false - + @@ -74,8 +61,8 @@ true false - - + + @@ -83,8 +70,8 @@ true true - - + + @@ -92,9 +79,9 @@ true false - - - + + + @@ -110,7 +97,7 @@ 1 - + NAME Status__c @@ -162,9 +149,9 @@ false false - 00h1l000001g86l + 00hKF000003jyYM 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 63f0a937a4..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 @@ -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,20 +32,12 @@ Required Name - - Edit - PersonMobilePhone - - - Edit - PersonEmail - Edit CRM_NavEmployeeName__c - + @@ -51,8 +45,8 @@ true true - - + + @@ -60,7 +54,7 @@ false false - + @@ -68,8 +62,8 @@ true false - - + + @@ -77,8 +71,8 @@ true true - - + + @@ -86,15 +80,15 @@ true false - - - + + + Record - + NAME Status__c @@ -146,9 +140,9 @@ false false - 00h1l000001g86m + 00hKF000003jyYN 4 0 Default - + \ No newline at end of file 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..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 @@ -1,13 +1,14 @@ NavEmployeeNameAccount__c + false false - IF($Permission.CRM_NavEmployees, Account__r.CRM_NavEmployeeName__c, "") + IF($Permission.CRM_NavEmployees, Person__r.CRM_FullName__c , "") BlankAsZero - + false false false Text false - + \ No newline at end of file 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 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 58c7b1a0f3..07b94b4848 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 @@ -641,6 +641,11 @@ Person__c.INT_KrrEmail__c true + + false + Person__c.INT_Confidential__c + true + false Person__c.INT_KrrMobilePhone__c @@ -1719,4 +1724,4 @@ true UseWebLink - + \ 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 8dc8f98696..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 @@ -4,6 +4,11 @@ TwoColumnsLeftToRight + + false + CRM_FullName__c + Readonly + false INT_KrrMobilePhone__c @@ -148,4 +153,4 @@ Update Update - + \ 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 0f6ebc25af..937ae4d44e 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 5ef143c75a..4bf76aba97 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 @@ -202,10 +202,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; }