From d545c1a58076e73e0384894c20822ff98d2ff0ea Mon Sep 17 00:00:00 2001 From: Sudhir Kesharwani Date: Wed, 12 Jun 2024 16:05:31 +0530 Subject: [PATCH 1/2] Update TimeCardContinue.fx.yaml Status should remain 1 - Pending whenever user makes updates to any of their timesheet. Updated status value on Save button click. --- .../Src/TimeCardContinue.fx.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/weekly-timesheet-sharepoint/sourcecode/WeeklyTimesheetTemplateSP/src/CanvasApps/src/ad_weeklytimecardsharepointtemplatecopy_ed80c/Src/TimeCardContinue.fx.yaml b/samples/weekly-timesheet-sharepoint/sourcecode/WeeklyTimesheetTemplateSP/src/CanvasApps/src/ad_weeklytimecardsharepointtemplatecopy_ed80c/Src/TimeCardContinue.fx.yaml index f26e0a4d..fb8f1595 100644 --- a/samples/weekly-timesheet-sharepoint/sourcecode/WeeklyTimesheetTemplateSP/src/CanvasApps/src/ad_weeklytimecardsharepointtemplatecopy_ed80c/Src/TimeCardContinue.fx.yaml +++ b/samples/weekly-timesheet-sharepoint/sourcecode/WeeklyTimesheetTemplateSP/src/CanvasApps/src/ad_weeklytimecardsharepointtemplatecopy_ed80c/Src/TimeCardContinue.fx.yaml @@ -618,8 +618,8 @@ Picture: "" }, Status: { - ID: 2, - Value: "Submitted for Approval" + ID: 1, + Value: "Pending" } } ), From c3a0a04716d0454adfd7fed18463625fea5d71b1 Mon Sep 17 00:00:00 2001 From: Sudhir Kesharwani Date: Wed, 12 Jun 2024 16:15:21 +0530 Subject: [PATCH 2/2] Update TimeCardContinue.fx.yaml Screen: My Timesheets When records are submitted with status "Submitted for approval", manager information should be updated with current user's manager. Instead it was being submitted as current user with status "Submitted for Approval" --- .../Src/TimeCardContinue.fx.yaml | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/samples/weekly-timesheet-sharepoint/sourcecode/WeeklyTimesheetTemplateSP/src/CanvasApps/src/ad_weeklytimecardsharepointtemplatecopy_ed80c/Src/TimeCardContinue.fx.yaml b/samples/weekly-timesheet-sharepoint/sourcecode/WeeklyTimesheetTemplateSP/src/CanvasApps/src/ad_weeklytimecardsharepointtemplatecopy_ed80c/Src/TimeCardContinue.fx.yaml index f26e0a4d..b1d5e473 100644 --- a/samples/weekly-timesheet-sharepoint/sourcecode/WeeklyTimesheetTemplateSP/src/CanvasApps/src/ad_weeklytimecardsharepointtemplatecopy_ed80c/Src/TimeCardContinue.fx.yaml +++ b/samples/weekly-timesheet-sharepoint/sourcecode/WeeklyTimesheetTemplateSP/src/CanvasApps/src/ad_weeklytimecardsharepointtemplatecopy_ed80c/Src/TimeCardContinue.fx.yaml @@ -737,13 +737,13 @@ Value: ddBillTo_1.Selected.Title }, Manager: { - '@odata.type': "#Microsoft.Azure.Connectors.SharePoint.SPListExpandedUser", - Claims: "i:0#.f|membership|" & currentUser.Email, - Department: "", - DisplayName: currentUser.FullName, - Email: currentUser.Email, - JobTitle: "", - Picture: "" + '@odata.type': "#Microsoft.Azure.Connectors.SharePoint.SPListExpandedUser", + Claims: "i:0#.f|membership|" & Office365Users.ManagerV2(User().Email).mail, + Department: "", + DisplayName: Office365Users.ManagerV2(User().Email).displayName, + Email: Office365Users.ManagerV2(User().Email).mail, + JobTitle: "", + Picture: "" }, Status: { ID: 2, @@ -788,13 +788,13 @@ Value: ddBillTo_1.Selected.Title }, Manager: { - '@odata.type': "#Microsoft.Azure.Connectors.SharePoint.SPListExpandedUser", - Claims: "i:0#.f|membership|" & currentUser.Email, - Department: "", - DisplayName: currentUser.FullName, - Email: currentUser.Email, - JobTitle: "", - Picture: "" + '@odata.type': "#Microsoft.Azure.Connectors.SharePoint.SPListExpandedUser", + Claims: "i:0#.f|membership|" & Office365Users.ManagerV2(User().Email).mail, + Department: "", + DisplayName: Office365Users.ManagerV2(User().Email).displayName, + Email: Office365Users.ManagerV2(User().Email).mail, + JobTitle: "", + Picture: "" }, Status: { ID: 2,