Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Tweaks from Sprint Review #383

Merged
merged 3 commits into from
Dec 21, 2020
Merged

Tweaks from Sprint Review #383

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
23b4df7
Tweaks from Sprint Review
jjbennett Dec 17, 2020
bcb1cf0
Fix updated label name
jjbennett Dec 17, 2020
3377b98
Fix capitalization
jjbennett Dec 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions force-app/main/default/labels/CustomLabels.labels-meta.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,11 @@
<value>Anonymous</value>
</labels>
<labels>
<fullName>Attendance</fullName>
<fullName>TrackAttendance</fullName>
<language>en_US</language>
<protected>false</protected>
<shortDescription>Attendance</shortDescription>
<value>Attendance</value>
<shortDescription>Track Attendance</shortDescription>
<value>Track Attendance</value>
</labels>
<labels>
<fullName>Save_Service_Delivery_Success</fullName>
Expand Down Expand Up @@ -214,11 +214,11 @@
<value>Done</value>
</labels>
<labels>
<fullName>Dont_Log_Attendance</fullName>
<fullName>Dont_Track_Attendance</fullName>
<language>en_US</language>
<protected>true</protected>
<shortDescription>Don't log attendance for this participant</shortDescription>
<value>Don't log attendance for this participant</value>
<shortDescription>Don't track attendance for this participant</shortDescription>
<value>Don't track attendance for this participant</value>
</labels>
<labels>
<fullName>Enabled</fullName>
Expand Down Expand Up @@ -279,12 +279,12 @@
<value>You can't delete this record. Ask your admin for help.</value>
</labels>
<labels>
<fullName>Duration</fullName>
<fullName>Time_Frame</fullName>
<categories></categories>
<language>en_US</language>
<protected>true</protected>
<shortDescription>Duration</shortDescription>
<value>Duration</value>
<shortDescription>Time Frame</shortDescription>
<value>Time Frame</value>
</labels>
<labels>
<fullName>Last_Week</fullName>
Expand Down Expand Up @@ -680,7 +680,7 @@
<language>en_US</language>
<protected>true</protected>
<shortDescription>Warning when list view limit is reached.</shortDescription>
<value>There are over 2,000 records. Some records may not be shown.</value>
<value>This list view has over 2,000 records. Some records may not be shown.</value>
</labels>
<labels>
<fullName>Months</fullName>
Expand Down
2 changes: 1 addition & 1 deletion force-app/main/default/lwc/attendance/attendance.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<div slot="title">
<lightning-icon icon-name="custom:custom15" size="small"></lightning-icon>
<span class="slds-p-left_x-small">
{header}
{labels.trackAttendance}
</span>
</div>

Expand Down
13 changes: 2 additions & 11 deletions force-app/main/default/lwc/attendance/attendance.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import CREATED_BY_FIELD from "@salesforce/schema/ServiceDelivery__c.CreatedById"
import SESSION_STATUS_FIELD from "@salesforce/schema/ServiceSession__c.Status__c";

import SUBMIT_LABEL from "@salesforce/label/c.Submit";
import ATTENDANCE_LABEL from "@salesforce/label/c.Attendance";
import TRACK_ATTENDANCE_LABEL from "@salesforce/label/c.TrackAttendance";
import LOADING_LABEL from "@salesforce/label/c.Loading";
import SUCCESS_LABEL from "@salesforce/label/c.Success";
import SUCCESS_MESSAGE_LABEL from "@salesforce/label/c.Save_Service_Delivery_Success";
Expand Down Expand Up @@ -74,7 +74,7 @@ export default class Attendance extends NavigationMixin(LightningElement) {

labels = {
submit: SUBMIT_LABEL,
attendance: ATTENDANCE_LABEL,
trackAttendance: TRACK_ATTENDANCE_LABEL,
loading: LOADING_LABEL,
success: SUCCESS_LABEL,
successMessage: SUCCESS_MESSAGE_LABEL,
Expand Down Expand Up @@ -198,15 +198,6 @@ export default class Attendance extends NavigationMixin(LightningElement) {
return this.sessionStatus && this.sessionStatus === PENDING;
}

get header() {
return (
this.labels.attendance +
(this.serviceDeliveries && this.serviceDeliveries.length
? " (" + this.serviceDeliveries.length + ")"
: "")
);
}

get printButtonLabel() {
return this.pageRef.type === ITEM_PAGE_NAVIGATION_TYPE
? this.labels.print
Expand Down
2 changes: 1 addition & 1 deletion force-app/main/default/lwc/attendanceRow/attendanceRow.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import { getRecordNotifyChange } from "lightning/uiRecordApi";
import SERVICE_DELIVERY_OBJECT from "@salesforce/schema/ServiceDelivery__c";
import QUANTITY_FIELD from "@salesforce/schema/ServiceDelivery__c.Quantity__c";
import ATTENDANCE_STATUS_FIELD from "@salesforce/schema/ServiceDelivery__c.AttendanceStatus__c";
import SKIP_LABEL from "@salesforce/label/c.Dont_Log_Attendance";
import SKIP_LABEL from "@salesforce/label/c.Dont_Track_Attendance";

// TODO: design parameter for "Allow users to skip logging attendance for selected participants."

Expand Down
6 changes: 3 additions & 3 deletions force-app/main/default/lwc/recentSessions/recentSessions.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,17 @@ <h1 slot="title" class="header-title-container slds-text-title_bold">
<div class="slds-form-element slds-var-p-left_small">
<label
class="slds-form-element__label slds-m-bottom_none"
for="durationSelector"
for="timeFrameSelector"
>
{labels.duration}
{labels.timeFrame}
</label>
<div class="slds-form-element__control">
<lightning-button-menu
variant="container"
class="listViewSelector"
label={selectedMenuItemLabel}
onselect={handleMenuItemSelected}
id="durationSelector"
id="timeFrameSelector"
>
<template for:each={menuItems} for:item="menuItem">
<lightning-menu-item
Expand Down
4 changes: 2 additions & 2 deletions force-app/main/default/lwc/recentSessions/recentSessions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import RECENT_SESSIONS_LABEL from "@salesforce/label/c.RecentSessions";
import LOADING_LABEL from "@salesforce/label/c.Loading";
import LIST_VIEW_LIMIT_LABEL from "@salesforce/label/c.List_View_Limit";
import LIST_VIEW_LABEL from "@salesforce/label/c.List_View";
import DURATION_LABEL from "@salesforce/label/c.Duration";
import TIME_FRAME_LABEL from "@salesforce/label/c.Time_Frame";

import SERVICE_SESSION_OBJECT from "@salesforce/schema/ServiceSession__c";
import ID_FIELD from "@salesforce/schema/ServiceSession__c.Id";
Expand Down Expand Up @@ -57,7 +57,7 @@ export default class RecentSessions extends LightningElement {
loading: LOADING_LABEL,
listViewLimit: LIST_VIEW_LIMIT_LABEL,
listView: LIST_VIEW_LABEL,
duration: DURATION_LABEL,
timeFrame: TIME_FRAME_LABEL,
};

fields = {
Expand Down
2 changes: 2 additions & 0 deletions force-app/main/default/objects/ServiceSession__c/listViews/All.listView-meta.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
<ListView xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>All</fullName>
<columns>NAME</columns>
<columns>ServiceLink__c</columns>
<columns>PrimaryServiceProvider__c</columns>
<columns>SessionStart__c</columns>
<columns>SessionEnd__c</columns>
<columns>Status__c</columns>
Expand Down