diff --git a/package.json b/package.json
index 85971ed91..8e1d1bb27 100644
--- a/package.json
+++ b/package.json
@@ -9,6 +9,7 @@
"ng": "ng",
"start": "ng serve",
"v3": "ng serve --project=v3 -c development",
+ "prev3": "npm run prebuildv3",
"poststart": "npm run generate-version",
"local": "ng serve -c local",
"postlocal": "npm run generate-version",
diff --git a/projects/v3/src/app/components/file/file.component.html b/projects/v3/src/app/components/file/file.component.html
index d36c38373..be6d95c8f 100644
--- a/projects/v3/src/app/components/file/file.component.html
+++ b/projects/v3/src/app/components/file/file.component.html
@@ -29,7 +29,7 @@
Feedback
-
-
+
-
+
Feedback
@@ -87,8 +87,7 @@
diff --git a/projects/v3/src/app/components/file/file.component.scss b/projects/v3/src/app/components/file/file.component.scss
index 28fcc20ff..ac2f077ce 100644
--- a/projects/v3/src/app/components/file/file.component.scss
+++ b/projects/v3/src/app/components/file/file.component.scss
@@ -49,3 +49,7 @@ ion-item {
}
}
}
+
+ion-textarea.preview {
+ padding-left: var(--padding-start);
+}
diff --git a/projects/v3/src/app/components/multi-team-member-selector/multi-team-member-selector.component.html b/projects/v3/src/app/components/multi-team-member-selector/multi-team-member-selector.component.html
index 5ece60f22..1695b0279 100644
--- a/projects/v3/src/app/components/multi-team-member-selector/multi-team-member-selector.component.html
+++ b/projects/v3/src/app/components/multi-team-member-selector/multi-team-member-selector.component.html
@@ -11,8 +11,17 @@
+
- {{ review.comment }}
+
+
+ Feedback
+
+
diff --git a/projects/v3/src/app/components/multi-team-member-selector/multi-team-member-selector.component.scss b/projects/v3/src/app/components/multi-team-member-selector/multi-team-member-selector.component.scss
index 545cb1275..4ed7918c8 100644
--- a/projects/v3/src/app/components/multi-team-member-selector/multi-team-member-selector.component.scss
+++ b/projects/v3/src/app/components/multi-team-member-selector/multi-team-member-selector.component.scss
@@ -33,6 +33,10 @@ ion-textarea {
border: 1px solid var(--practera-grey-50);
border-radius: var(--border-radius);
font-size: 14px !important;
+ &.preview {
+ border: none;
+ padding-left: var(--padding-start);
+ }
}
ion-item {
diff --git a/projects/v3/src/app/components/multiple/multiple.component.html b/projects/v3/src/app/components/multiple/multiple.component.html
index 79b03c3df..b6a9b7af3 100644
--- a/projects/v3/src/app/components/multiple/multiple.component.html
+++ b/projects/v3/src/app/components/multiple/multiple.component.html
@@ -24,8 +24,17 @@ {
+
- {{ review.comment }}
+
+
+ Feedback
+
+
diff --git a/projects/v3/src/app/components/multiple/multiple.component.scss b/projects/v3/src/app/components/multiple/multiple.component.scss
index 771d9c49c..6c4de4843 100644
--- a/projects/v3/src/app/components/multiple/multiple.component.scss
+++ b/projects/v3/src/app/components/multiple/multiple.component.scss
@@ -24,6 +24,11 @@ ion-textarea {
border: 1px solid var(--practera-grey-50);
border-radius: var(--border-radius);
font-size: 14px !important;
+
+ &.preview {
+ border: none;
+ padding-left: var(--padding-start);
+ }
}
.answer-text {
@@ -58,3 +63,29 @@ ion-item {
--background: var(--practera-light-grey-50);
}
}
+
+.feedback-field {
+ --ion-item-background: #FFF7E3;
+ --ion-background-color: #FFF7E3;
+ background-color: #FFF7E3;
+
+ .feedback-title {
+ --min-height: 1em;
+ font-size: smaller;
+
+ ion-icon,
+ ion-label {
+ background-color: #FFF7E3;
+ }
+ }
+
+ ion-textarea {
+ background: white;
+ font-size: 14px !important;
+
+ &.textarea {
+ border: 1px solid var(--practera-review-border-color);
+ border-radius: 8px;
+ }
+ }
+}
\ No newline at end of file
diff --git a/projects/v3/src/app/components/oneof/oneof.component.html b/projects/v3/src/app/components/oneof/oneof.component.html
index e9f05fb1a..6247ec27f 100644
--- a/projects/v3/src/app/components/oneof/oneof.component.html
+++ b/projects/v3/src/app/components/oneof/oneof.component.html
@@ -24,8 +24,17 @@ {{question.
-
- {{ review.comment }}
+
+
+
+
+ Feedback
+
+
diff --git a/projects/v3/src/app/components/oneof/oneof.component.scss b/projects/v3/src/app/components/oneof/oneof.component.scss
index c31f969ba..46dd881ce 100644
--- a/projects/v3/src/app/components/oneof/oneof.component.scss
+++ b/projects/v3/src/app/components/oneof/oneof.component.scss
@@ -27,6 +27,11 @@ ion-textarea {
border: 1px solid var(--practera-grey-50);
border-radius: var(--border-radius);
font-size: 14px !important;
+
+ &.preview {
+ border: none;
+ padding-left: var(--padding-start);
+ }
}
@@ -61,3 +66,29 @@ ion-item {
--background: var(--practera-light-grey-50);
}
}
+
+.feedback-field {
+ --ion-item-background: #FFF7E3;
+ --ion-background-color: #FFF7E3;
+ background-color: #FFF7E3;
+
+ .feedback-title {
+ --min-height: 1em;
+ font-size: smaller;
+
+ ion-icon,
+ ion-label {
+ background-color: #FFF7E3;
+ }
+ }
+
+ ion-textarea {
+ background: white;
+ font-size: 14px !important;
+
+ &.textarea {
+ border: 1px solid var(--practera-review-border-color);
+ border-radius: 8px;
+ }
+ }
+}
\ No newline at end of file
diff --git a/projects/v3/src/app/components/team-member-selector/team-member-selector.component.html b/projects/v3/src/app/components/team-member-selector/team-member-selector.component.html
index c96ac40f4..8d781b19d 100644
--- a/projects/v3/src/app/components/team-member-selector/team-member-selector.component.html
+++ b/projects/v3/src/app/components/team-member-selector/team-member-selector.component.html
@@ -16,8 +16,17 @@
+
- {{ review.comment }}
+
+
+ Feedback
+
+
diff --git a/projects/v3/src/app/components/team-member-selector/team-member-selector.component.scss b/projects/v3/src/app/components/team-member-selector/team-member-selector.component.scss
index a6cddffc9..7e1eba33e 100644
--- a/projects/v3/src/app/components/team-member-selector/team-member-selector.component.scss
+++ b/projects/v3/src/app/components/team-member-selector/team-member-selector.component.scss
@@ -33,6 +33,10 @@ ion-textarea {
border: 1px solid var(--practera-grey-50);
border-radius: var(--border-radius);
font-size: 14px !important;
+ &.preview {
+ border: none;
+ padding-left: var(--padding-start);
+ }
}
ion-item {
diff --git a/projects/v3/src/app/components/text/text.component.html b/projects/v3/src/app/components/text/text.component.html
index 5dc6882b7..d97ec9a6f 100644
--- a/projects/v3/src/app/components/text/text.component.html
+++ b/projects/v3/src/app/components/text/text.component.html
@@ -5,15 +5,22 @@ {{question.n
{{ submission?.answer }}
-
+
Expert's answer
-
- {{ review.answer }}
-
-
- {{ review.comment }}
-
+
{{ review.answer }}
+
+
+
+
+ Feedback
+
+
+
@@ -73,6 +80,7 @@
Feedback
+
{
+ const activityCardImage = this.storageService.getUser().activityCardImage;
const programImage = this.storageService.getUser().programImage;
- this.renderer.setStyle(this.el.nativeElement, 'backgroundImage', `url(${programImage})`);
+ this.renderer.setStyle(this.el.nativeElement, 'backgroundImage', `url(${activityCardImage || programImage})`);
};
}
diff --git a/projects/v3/src/app/services/auth.service.ts b/projects/v3/src/app/services/auth.service.ts
index 4c8ad9d5e..403e94c04 100644
--- a/projects/v3/src/app/services/auth.service.ts
+++ b/projects/v3/src/app/services/auth.service.ts
@@ -69,7 +69,10 @@ interface AuthEndpoint {
data: {
auth: {
apikey: string;
- experience: object;
+ experience: {
+ cardUrl?: string;
+ [key: string]: any; // default card activity image
+ };
email?: string;
unregistered?: boolean;
activationCode?: string;
diff --git a/projects/v3/src/app/services/experience.service.ts b/projects/v3/src/app/services/experience.service.ts
index dc3d0acac..aeccfde80 100644
--- a/projects/v3/src/app/services/experience.service.ts
+++ b/projects/v3/src/app/services/experience.service.ts
@@ -257,7 +257,7 @@ export class ExperienceService {
institutionName: exp?.name || null,
projectId: exp?.projectId,
timelineId: exp?.timelineId,
- activityCardImage: cardBackgroundImage,
+ activityCardImage: cardBackgroundImage, // default activity image
activityCompleteMessage: exp?.activityCompleteMessage || null,
chatEnabled: exp?.chatEnable || true,
teamId: null,
diff --git a/projects/v3/src/app/services/storage.service.ts b/projects/v3/src/app/services/storage.service.ts
index 4bc55d56d..a76caa019 100644
--- a/projects/v3/src/app/services/storage.service.ts
+++ b/projects/v3/src/app/services/storage.service.ts
@@ -27,7 +27,7 @@ export interface User {
teamName?: string;
userHash?: string;
colors?: Colors;
- activityCardImage?: string;
+ activityCardImage?: string; // default activity card image
hasReviewRating?: boolean;
truncateDescription?: boolean;
enrolment?: any;