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

Fixed the issues identified during adoption testing #209

Merged
merged 3 commits into from
Oct 3, 2024
Merged

Fixed the issues identified during adoption testing #209

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
e9d6a3d
Fixed the issues identified during adoption testing
Oct 1, 2024
49b67a7
updated
Oct 1, 2024
aaae09c
updated
Oct 3, 2024
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
67 changes: 34 additions & 33 deletions src/components/MultiStep/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,37 +147,33 @@ class MultiStep extends BridgeBase {
return sStyle;
}

getStepHorizontallMarkerStyle(step: any, bSubStep: boolean = false): string {
getStepHorizontallMarkerStyle(step: any, type): string {
let sStyle = '';
switch (step.visited_status) {
case 'success':
if (bSubStep) {
sStyle = 'psdk-horizontal-marker h-success h-sub';
} else {
sStyle = 'psdk-horizontal-marker h-success';
}
break;
case 'current':
if (bSubStep) {
sStyle = 'psdk-horizontal-marker h-current h-sub';
switch (type) {
case 'label':
if (step.visited_status === 'current') {
sStyle = 'psdk-horizontal-step-label-selected';
} else {
sStyle = 'psdk-horizontal-marker h-current';
sStyle = 'psdk-horizontal-step-label';
}
break;
case 'future':
if (bSubStep) {
sStyle = 'psdk-horizontal-marker h-future h-sub';
case 'icon':
if (step.visited_status === 'current') {
sStyle = 'psdk-horizontal-step-icon-selected';
} else {
sStyle = 'psdk-horizontal-marker h-future';
sStyle = 'psdk-horizontal-step-icon';
}
break;
default:
break;
}

return sStyle;
}

_showHLine(index: number): boolean {
return index < this.arNavigationSteps.length - 1;
}

getStepMarkerStyle(step: any, bSubStep: boolean = false): string {
if (this.bIsVertical) {
return this.getStepVerticalMarkerStyle(step, bSubStep);
Expand Down Expand Up @@ -228,29 +224,35 @@ class MultiStep extends BridgeBase {

let count = 0;
for (const step of this.arNavigationSteps) {
let stepStyle = 'psdk-horizontal-header-step';
if (count == 0) {
stepStyle = 'psdk-horizontal-header-step-first';
} else if (count + 1 == this.arNavigationSteps.length) {
stepStyle = 'psdk-horizontal-header-step-last';
}
if (step.steps) {
for (const sStep of step.steps) {
const stepMarkerStyle = this.getStepMarkerStyle(sStep, true);
arHorizontalSteps.push(html`
<div class="psdk-horizontal-header-step">
<div class="psdk-horizontal-step-name">${sStep.name}</div>
<div class="${stepMarkerStyle}"></div>
<div class="psdk-horizontal-step-header">
<div class="${this.getStepHorizontallMarkerStyle(sStep, 'icon')}">
<div class="psdk-horizontal-step-icon-content">
<span>${count + 1}</span>
</div>
</div>
<div class="${this.getStepHorizontallMarkerStyle(sStep, 'label')}">
<div class="psdk-horizontal-step-text-label" id="selected-label">${sStep.name}</div>
</div>
</div>
${this._showHLine(count) ? html`<div class="psdk-horizontal-step-line" /> ` : html``}
`);
}
} else {
const stepMarkerStyle = this.getStepMarkerStyle(step, false);
arHorizontalSteps.push(html`
<div class="${stepStyle}">
<div class="psdk-horizontal-step-name">${step.name}</div>
<div class="${stepMarkerStyle}"></div>
<div class="psdk-horizontal-step-header">
<div class="${this.getStepHorizontallMarkerStyle(step, 'icon')}">
<div class="psdk-horizontal-step-icon-content">
<span>${count + 1}</span>
</div>
</div>
<div class="${this.getStepHorizontallMarkerStyle(step, 'label')}">
<div class="psdk-horizontal-step-text-label" id="selected-label">${step.name}</div>
</div>
</div>
${this._showHLine(count) ? html`<div class="psdk-horizontal-step-line" /> ` : html``}
`);
}
count++;
Expand All @@ -259,7 +261,6 @@ class MultiStep extends BridgeBase {
return html`
<div class="psdk-horizontal-progress">
<div class="psdk-horizontal-steps">${arHorizontalSteps}</div>
<div class="psdk-horizontal-bar"></div>
</div>
<div>${this.assignmentCardHtml()}</div>
`;
Expand Down
131 changes: 92 additions & 39 deletions src/components/MultiStep/multi-step-styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,52 +83,16 @@ export const multiStepStyles = html`
}

.psdk-horizontal-steps {
white-space: nowrap;
display: flex;
flex-direction: row;
justify-content: space-between;
width: 100%;
align-items: center;
text-align: left;
}

.psdk-horizontal-assignment {
padding-left: 2rem;
}

.psdk-horizontal-header-step {
padding: 0.5rem;
height: auto;
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
flex-basis: 0;
max-width: 100%;
min-width: 0;
}

.psdk-horizontal-header-step-first {
padding: 0.5rem;
height: auto;
display: flex;
flex-direction: column;
justify-content: center;
align-items: flex-start;
flex-basis: 0;
max-width: 100%;
min-width: 0;
}

.psdk-horizontal-header-step-last {
padding: 0.5rem;
height: auto;
display: flex;
flex-direction: column;
justify-content: center;
align-items: flex-end;
flex-basis: 0;
max-width: 100%;
min-width: 0;
}

.psdk-horizontal-step-name {
margin-bottom: 0.5rem;
font-size: 0.875rem;
Expand Down Expand Up @@ -160,6 +124,95 @@ export const multiStepStyles = html`
right: calc(2% + 0.8rem);
}

.psdk-horizontal-stepper {
background-color: transparent;
display: block;
}

.psdk-horizontal-stepper-header-container {
white-space: nowrap;
display: flex;
align-items: center;
text-align: left;
}

.psdk-horizontal-step-header {
overflow: hidden;
outline: none;
cursor: pointer;
position: relative;
box-sizing: content-box;
display: flex;
height: 72px;
overflow: hidden;
align-items: center;
padding: 0 24px;
}

.psdk-horizontal-step-icon {
background-color: var(--app-neutral-color);
color: #fff;
border-radius: 50%;
height: 24px;
width: 24px;
flex-shrink: 0;
position: relative;
display: block;
margin-right: 8px;
flex: none;
}

.psdk-horizontal-step-icon-content {
display: block;
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
}

.psdk-horizontal-step-icon-selected {
background-color: var(--app-primary-color);
color: #fff;
border-radius: 50%;
height: 24px;
width: 24px;
flex-shrink: 0;
position: relative;
display: block;
margin-right: 8px;
flex: none;
}

.psdk-horizontal-step-label {
color: rgba(0, 0, 0, 0.54);
display: inline-block;
min-width: 50px;
vertical-align: middle;
font-size: 14px;
font-weight: 500;
white-space: initial;
}

.psdk-horizontal-step-label-selected {
color: rgba(0, 0, 0, 0.87);
display: inline-block;
min-width: 50px;
vertical-align: middle;
font-size: 14px;
font-weight: 500;
white-space: initial;
}

.psdk-horizontal-step-line {
border-top-color: rgba(0, 0, 0, 0.12);
border-top-width: 1px;
border-top-style: solid;
flex: auto;
height: 0;
margin: 0 -16px;
min-width: 32px;
}

.h-success {
border: 0.15rem solid var(--app-primary-color);
}
Expand Down
1 change: 0 additions & 1 deletion src/components/NavBar/navbar-styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ export const navbarStyles = html`
flex-direction: column;
justify-content: flex-start;
background: var(--app-nav-bg);
width: var(--app-nav-width);
height: 100%;
color: var(--app-nav-color);
overflow: hidden;
Expand Down
1 change: 1 addition & 0 deletions src/components/Stages/stages-styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ export const stagesStyles = html`
border: 0.0625rem solid var(--app-neutral-light-color);
overflow: hidden;
display: flex;
flex-wrap: wrap;
}

.psdk-stages-chevron {
Expand Down
1 change: 1 addition & 0 deletions src/components/View/view-styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ export const viewStyles = html`

.psdk-view-top {
padding: 0;
overflow-x: hidden;
}

.template-title-container {
Expand Down
4 changes: 4 additions & 0 deletions src/components/designSystemExtension/LionInputDateOnly/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ class LionInputDateOnly extends LionInputDate {
this.parser = viewValue => new Date(viewValue);
this.serializer = toIsoDate;
this.formatter = toIsoDate;

if (this.modelValue) {
this.value = this.serializer(this.modelValue);
}
}
}
export default LionInputDateOnly;
4 changes: 4 additions & 0 deletions src/components/designSystemExtension/LionInputDateTime/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ class LionInputDatetime extends LionInputDate {
this.parser = viewValue => new Date(viewValue);
this.serializer = toIsoDatetime;
this.formatter = toIsoDatetime;

if (this.modelValue) {
this.value = this.serializer(this.modelValue);
}
}
}
export default LionInputDatetime;
6 changes: 5 additions & 1 deletion src/components/templates/AppShell/appshell-styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,15 @@ export const appShellStyles = html`
background-color: var(--app-background-color);
}

.nav-bar {
width: 10%;
}

.appshell-main {
position: relative;
min-height: 100vh;
display: block;
width: 100%;
width: 90%;
}

.psdk-icon {
Expand Down
2 changes: 1 addition & 1 deletion src/components/templates/AppShell/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ class AppShell extends BridgeBase {
const theTemplate = this.bShowAppShell
? html`
<div class="appshell-top">
<nav-bar .pConn=${this.thePConn} appName=${this.appName} .pages=${this.pages} .caseTypes=${this.caseTypes}></nav-bar>
<nav-bar class="nav-bar" .pConn=${this.thePConn} appName=${this.appName} .pages=${this.pages} .caseTypes=${this.caseTypes}></nav-bar>
<div class="appshell-main">${this.thePConn.getChildren().map(child => html`<view-container .pConn=${child}></view-container>`)}</div>
</div>
`
Expand Down
5 changes: 3 additions & 2 deletions src/components/templates/CaseView/case-view-styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,18 +66,19 @@ export const caseViewStyles = html`

.psdk-case-view-info {
flex: 0 0 auto;
width: 25rem;
float: left;
padding: 0rem 0.3125rem 0rem 0rem;
height: 100%; /* Should be removed. Only for demonstration */
background-color: var (--app-form-color);
width: 25%;
}

.psdk-case-view-main {
flex-grow: 2;
float: left;
padding: 0rem 0.3125rem;
height: 100%; /* Should be removed. Only for demonstration */
width: 50%;
}

.psdk-case-view-buttons {
Expand All @@ -88,10 +89,10 @@ export const caseViewStyles = html`

.psdk-case-view-utilities {
margin: 0.625rem 0rem;
width: 21.875rem;
float: left;
padding: 0rem 0.3125rem;
height: 100%; /* Should be removed. Only for demonstration */
width: 25%;
}

.psdk-case-view-divider {
Expand Down
Loading