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.

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

Release 5.0.2 #3203

Merged
merged 8 commits into from
Oct 14, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion src/app/manage-learn/core/services/utils.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -521,9 +521,10 @@ export class UtilsService {
? this.requiredFields + " in"
: ""
} your profile to access the feature.`,
cssClass:'central-alert',
buttons: [
{
text: "Update Profile",
text: "Update profile",
role: "cancel",
handler: blah => {
this.router.navigate([`${RouterLinks.HOME}`], {replaceUrl:true});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<ion-list>
<ion-radio-group>
<ion-item *ngFor="let data of dataList">
<ion-label>{{data.name}}</ion-label>
<ion-label class="text-wrap">{{data.name}}</ion-label>
<ion-radio slot="start" value="{{data._id}}" (click)="selectProgram(data)"></ion-radio>
</ion-item>
</ion-radio-group>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
.container {
margin-top: env(safe-area-inset-top);
}
.text-wrap{
white-space: normal !important;
}
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ export class AttachmentListingPage implements OnInit {
});
const alert = await this.alert.create({
cssClass: 'attachment-delete-alert',
message: data['FRMELEMNTS_LBL_ATTACHMENT_DELETE_CONFIRMATION'] + ' ' + this.selectedTab,
message: data['FRMELEMNTS_LBL_ATTACHMENT_DELETE_CONFIRMATION'] + ' ' + this.selectedTab + '?',
buttons: [
{
text: data['YES'],
Expand Down
6 changes: 3 additions & 3 deletions src/app/manage-learn/project/task-view/task-view.page.ts
Original file line number Diff line number Diff line change
Expand Up @@ -249,21 +249,21 @@ export class TaskViewPage {
// task and project delete permission.
async askPermissionToDelete(subtask, type) {
let data;
this.translate.get(["FRMELEMNTS_LBL_DELETE_CONFIRMATION", "CANCEL", "BTN_SUBMIT"]).subscribe((text) => {
this.translate.get(["FRMELEMNTS_LBL_DELETE_CONFIRMATION", "NO", "YES"]).subscribe((text) => {
data = text;
});
const alert = await this.alert.create({
message: data["FRMELEMNTS_LBL_DELETE_CONFIRMATION"],
cssClass: 'background-theme-color',
buttons: [
{
text: data["CANCEL"],
text: data["NO"],
role: "cancel",
cssClass: "secondary",
handler: (blah) => { },
},
{
text: data["BTN_SUBMIT"],
text: data["YES"],
handler: () => {
this.delete(subtask);
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<ion-card class="_cardBg ion-padding">
<ion-col class="_flex-box _justify-content-center _flex-direction-column">
<h4 [ngClass]="{'_validQuestion': data?.value}" class="flexbox">
<h4 [ngClass]="{'_validQuestion':( data?.value || !data?.validation?.required)}" class="flexbox">
<app-question-heading [inputIndex]="inputIndex" [data]="data" [enableQuestionReadOut]="enableQuestionReadOut">
</app-question-heading>
</h4>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<ion-card class="_cardBg ion-padding">
<ion-col class="_flex-box _justify-content-center _flex-direction-column">
<h4 [ngClass]="{'_validQuestion': data?.value}" class="flexbox">
<h4 [ngClass]="{'_validQuestion': (data?.value || !data?.validation?.required)}" class="flexbox">
<app-question-heading [inputIndex]="inputIndex" [data]="data" [enableQuestionReadOut]="enableQuestionReadOut">
</app-question-heading>
</h4>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ <h3 padding>{{ currentEvidence?.name }}</h3>
<h5 class="instacnce">{{ question?.instanceIdentifier }} {{ j + 1 }}</h5>
<div *ngFor="let answer of instance; let k = index" class="matrixQuestion">
<div *ngIf="answer?.value">
<h3>Q{{ k + 1 }}. {{ answer?.question[0] }}</h3>
<h3>{{ answer?.questionNumber}}. {{ answer?.question[0] }}</h3>
<p *ngIf="answer?.responseType !== 'radio' && answer?.responseType !== 'multiselect' && answer?.responseType !== 'date'">
Ans. {{ answer?.value }}
</p>
Expand All @@ -53,11 +53,11 @@ <h3>Q{{ k + 1 }}. {{ answer?.question[0] }}</h3>
<div *ngFor="let answer of question.pageQuestions; let k = index" class="matrixQuestion">
<div *ngIf="answer?.responseType === 'matrix'; else notMatrix">
<div *ngIf="answer.value">
<h3>Q{{ i + 1 }}. {{ answer?.question[0] }}</h3>
<h3>{{ answer?.questionNumber}}. {{ answer?.question[0] }}</h3>
<div *ngFor="let instance of answer.value; let j = index" class="instanceQuest">
<h5 class="instacnce">{{ answer?.instanceIdentifier }} {{ j + 1 }}</h5>
<div *ngFor="let ans of instance; let k = index" class="matrixQuestion">
<h3>Q{{ k + 1 }}. {{ ans?.question[0] }}</h3>
<h3>{{ ans?.questionNumber}}. {{ ans?.question[0] }}</h3>
<p *ngIf="ans?.responseType !== 'radio' && ans?.responseType !== 'multiselect' && ans?.responseType !== 'date'">
Ans. {{ ans?.value }}
</p>
Expand All @@ -76,7 +76,7 @@ <h3>Q{{ k + 1 }}. {{ ans?.question[0] }}</h3>
</div>
<ng-template #notMatrix>
<div class="instanceQuest" *ngIf="answer?.value">
<h5>Q{{ k + 1 }}. {{ answer?.question[0] }}</h5>
<h5>{{ answer?.questionNumber}}. {{ answer?.question[0] }}</h5>
<p *ngIf="answer?.responseType !== 'radio' && answer?.responseType !== 'multiselect' && answer?.responseType !== 'date'">
Ans. {{ answer?.value }}
</p>
Expand Down