Skip to content

Commit

Permalink
Merge pull request #586 from correctexam/cloudfaredeploy
Browse files Browse the repository at this point in the history
finalize refactor and fix input number
  • Loading branch information
barais authored Jan 17, 2025
2 parents 1e214ef + 7b2efba commit b4e3df2
Show file tree
Hide file tree
Showing 40 changed files with 494 additions and 122 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,31 @@

<div class="row mb-3" *ngIf="editForm.controls.id.value !== null">
<label class="form-label" jhiTranslate="global.field.id" for="field_id">ID</label>
<input type="number" class="form-control" name="id" id="field_id" data-cy="id" formControlName="id" [readonly]="true" />
<input
type="number"
(mouseup)="$event.stopPropagation()"
class="form-control"
name="id"
id="field_id"
data-cy="id"
formControlName="id"
[readonly]="true"
/>
</div>

<div class="row mb-3">
<label class="form-label" jhiTranslate="gradeScopeIsticApp.answer2HybridGradedComment.stepValue" for="field_stepValue"
>Step Value</label
>
<input type="number" class="form-control" name="stepValue" id="field_stepValue" data-cy="stepValue" formControlName="stepValue" />
<input
type="number"
(mouseup)="$event.stopPropagation()"
class="form-control"
name="stepValue"
id="field_stepValue"
data-cy="stepValue"
formControlName="stepValue"
/>
</div>

<div class="row mb-3">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,16 @@ <h2 id="jhi-comments-heading" data-cy="CommentsCreateUpdateHeading" jhiTranslate

<div class="row mb-3" [hidden]="editForm.get('id')!.value == null">
<label class="form-label" jhiTranslate="global.field.id" for="field_id">ID</label>
<input type="number" class="form-control" name="id" id="field_id" data-cy="id" formControlName="id" [readonly]="true" />
<input
type="number"
(mouseup)="$event.stopPropagation()"
class="form-control"
name="id"
id="field_id"
data-cy="id"
formControlName="id"
[readonly]="true"
/>
</div>

<div class="row mb-3">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,16 @@

<div class="row mb-3" [hidden]="editForm.get('id')!.value == null">
<label class="form-label" jhiTranslate="global.field.id" for="field_id">ID</label>
<input type="number" class="form-control" name="id" id="field_id" data-cy="id" formControlName="id" [readonly]="true" />
<input
type="number"
(mouseup)="$event.stopPropagation()"
class="form-control"
name="id"
id="field_id"
data-cy="id"
formControlName="id"
[readonly]="true"
/>
</div>

<div class="row mb-3">
Expand All @@ -34,16 +43,21 @@
<div class="row mb-3">
<label jhiTranslate="gradeScopeIsticApp.courseGroup.students" for="field_students">Students</label>
<select class="form-control" id="field_students" multiple name="students" formControlName="students">
<option [ngValue]="getSelected(editForm.get('students')!.value, studentOption)" *ngFor="let studentOption of students; trackBy: trackById">{{ studentOption.name }}</option>
</select>
<option
[ngValue]="getSelected(editForm.get('students')!.value, studentOption)"
*ngFor="let studentOption of students; trackBy: trackById"
>
{{ studentOption.name }}
</option>
</select>
</div>

<div class="row mb-3">
<label class="form-label" jhiTranslate="gradeScopeIsticApp.courseGroup.course" for="field_course">Course</label>
<select class="form-control" id="field_course" name="course" formControlName="courseId">
<option [ngValue]="null"></option>
<option [ngValue]="courseOption.id" *ngFor="let courseOption of courses; trackBy: trackById">{{ courseOption.name }}</option>
</select>
</select>
</div>
</div>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,16 @@ <h2 id="jhi-course-heading" data-cy="CourseCreateUpdateHeading" jhiTranslate="gr

<div class="row mb-3" [hidden]="editForm.get('id')!.value == null">
<label class="form-label" jhiTranslate="global.field.id" for="field_id">ID</label>
<input type="number" class="form-control" name="id" id="field_id" data-cy="id" formControlName="id" [readonly]="true" />
<input
type="number"
(mouseup)="$event.stopPropagation()"
class="form-control"
name="id"
id="field_id"
data-cy="id"
formControlName="id"
[readonly]="true"
/>
</div>

<div class="row mb-3">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,16 @@

<div class="row mb-3" [hidden]="editForm.get('id')!.value == null">
<label class="form-label" jhiTranslate="global.field.id" for="field_id">ID</label>
<input type="number" class="form-control" name="id" id="field_id" data-cy="id" formControlName="id" [readonly]="true" />
<input
type="number"
(mouseup)="$event.stopPropagation()"
class="form-control"
name="id"
id="field_id"
data-cy="id"
formControlName="id"
[readonly]="true"
/>
</div>

<div class="row mb-3">
Expand All @@ -29,20 +38,36 @@

<div class="row mb-3">
<label class="form-label" jhiTranslate="gradeScopeIsticApp.examSheet.pagemin" for="field_pagemin">Pagemin</label>
<input type="number" class="form-control" name="pagemin" id="field_pagemin" data-cy="pagemin" formControlName="pagemin" />
<input
type="number"
(mouseup)="$event.stopPropagation()"
class="form-control"
name="pagemin"
id="field_pagemin"
data-cy="pagemin"
formControlName="pagemin"
/>
</div>

<div class="row mb-3">
<label class="form-label" jhiTranslate="gradeScopeIsticApp.examSheet.pagemax" for="field_pagemax">Pagemax</label>
<input type="number" class="form-control" name="pagemax" id="field_pagemax" data-cy="pagemax" formControlName="pagemax" />
<input
type="number"
(mouseup)="$event.stopPropagation()"
class="form-control"
name="pagemax"
id="field_pagemax"
data-cy="pagemax"
formControlName="pagemax"
/>
</div>

<div class="row mb-3">
<label class="form-label" jhiTranslate="gradeScopeIsticApp.examSheet.scan" for="field_scan">Scan</label>
<select class="form-control" id="field_scan" name="scan" formControlName="scanId">
<option [ngValue]="null"></option>
<option [ngValue]="scanOption.id" *ngFor="let scanOption of scans; trackBy: trackById">{{ scanOption.name }}</option>
</select>
</select>
</div>
</div>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,16 @@ <h2 id="jhi-exam-heading" data-cy="ExamCreateUpdateHeading" jhiTranslate="gradeS

<div class="row mb-3" [hidden]="editForm.get('id')!.value == null">
<label class="form-label" jhiTranslate="global.field.id" for="field_id">ID</label>
<input type="number" class="form-control" name="id" id="field_id" data-cy="id" formControlName="id" [readonly]="true" />
<input
type="number"
(mouseup)="$event.stopPropagation()"
class="form-control"
name="id"
id="field_id"
data-cy="id"
formControlName="id"
[readonly]="true"
/>
</div>

<div class="row mb-3">
Expand All @@ -27,56 +36,58 @@ <h2 id="jhi-exam-heading" data-cy="ExamCreateUpdateHeading" jhiTranslate="gradeS
<label class="form-label" jhiTranslate="gradeScopeIsticApp.exam.template" for="field_template">Template</label>
<select class="form-control" id="field_template" name="template" formControlName="templateId">
<option [ngValue]="null"></option>
<option [ngValue]="templateOption.id" *ngFor="let templateOption of templates; trackBy: trackById">{{ templateOption.name }}</option>
</select>
<option [ngValue]="templateOption.id" *ngFor="let templateOption of templates; trackBy: trackById">
{{ templateOption.name }}
</option>
</select>
</div>

<div class="row mb-3">
<label class="form-label" jhiTranslate="gradeScopeIsticApp.exam.idzone" for="field_idzone">Idzone</label>
<select class="form-control" id="field_idzone" name="idzone" formControlName="idzoneId">
<option [ngValue]="null"></option>
<option [ngValue]="zoneOption.id" *ngFor="let zoneOption of idzones; trackBy: trackById">{{ zoneOption.id }}</option>
</select>
</select>
</div>

<div class="row mb-3">
<label class="form-label" jhiTranslate="gradeScopeIsticApp.exam.namezone" for="field_namezone">Namezone</label>
<select class="form-control" id="field_namezone" name="namezone" formControlName="namezoneId">
<option [ngValue]="null"></option>
<option [ngValue]="zoneOption.id" *ngFor="let zoneOption of namezones; trackBy: trackById">{{ zoneOption.id }}</option>
</select>
</select>
</div>

<div class="row mb-3">
<label class="form-label" jhiTranslate="gradeScopeIsticApp.exam.firstnamezone" for="field_firstnamezone">Firstnamezone</label>
<select class="form-control" id="field_firstnamezone" name="firstnamezone" formControlName="firstnamezoneId">
<option [ngValue]="null"></option>
<option [ngValue]="zoneOption.id" *ngFor="let zoneOption of firstnamezones; trackBy: trackById">{{ zoneOption.id }}</option>
</select>
</select>
</div>

<div class="row mb-3">
<label class="form-label" jhiTranslate="gradeScopeIsticApp.exam.notezone" for="field_notezone">Notezone</label>
<select class="form-control" id="field_notezone" name="notezone" formControlName="notezoneId">
<option [ngValue]="null"></option>
<option [ngValue]="zoneOption.id" *ngFor="let zoneOption of notezones; trackBy: trackById">{{ zoneOption.id }}</option>
</select>
</select>
</div>

<div class="row mb-3">
<label class="form-label" jhiTranslate="gradeScopeIsticApp.exam.scanfile" for="field_scanfile">Scanfile</label>
<select class="form-control" id="field_scanfile" name="scanfile" formControlName="scanfileId">
<option [ngValue]="null"></option>
<option [ngValue]="scanOption.id" *ngFor="let scanOption of scanfiles; trackBy: trackById">{{ scanOption.name }}</option>
</select>
</select>
</div>

<div class="row mb-3">
<label class="form-label" jhiTranslate="gradeScopeIsticApp.exam.course" for="field_course">Course</label>
<select class="form-control" id="field_course" name="course" formControlName="courseId">
<option [ngValue]="null"></option>
<option [ngValue]="courseOption.id" *ngFor="let courseOption of courses; trackBy: trackById">{{ courseOption.name }}</option>
</select>
</select>
</div>
</div>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,28 +14,47 @@

<div class="row mb-3" [hidden]="editForm.get('id')!.value == null">
<label class="form-label" jhiTranslate="global.field.id" for="field_id">ID</label>
<input type="number" class="form-control" name="id" id="field_id" data-cy="id" formControlName="id" [readonly]="true" />
<input
type="number"
(mouseup)="$event.stopPropagation()"
class="form-control"
name="id"
id="field_id"
data-cy="id"
formControlName="id"
[readonly]="true"
/>
</div>

<div class="row mb-3">
<label class="form-label" jhiTranslate="gradeScopeIsticApp.finalResult.note" for="field_note">Note</label>
<input type="number" class="form-control" name="note" id="field_note" data-cy="note" formControlName="note" />
<input
type="number"
(mouseup)="$event.stopPropagation()"
class="form-control"
name="note"
id="field_note"
data-cy="note"
formControlName="note"
/>
</div>

<div class="row mb-3">
<label class="form-label" jhiTranslate="gradeScopeIsticApp.finalResult.student" for="field_student">Student</label>
<select class="form-control" id="field_student" name="student" formControlName="studentId">
<option [ngValue]="null"></option>
<option [ngValue]="studentOption.id" *ngFor="let studentOption of students; trackBy: trackById">{{ studentOption.name }}</option>
</select>
<option [ngValue]="studentOption.id" *ngFor="let studentOption of students; trackBy: trackById">
{{ studentOption.name }}
</option>
</select>
</div>

<div class="row mb-3">
<label class="form-label" jhiTranslate="gradeScopeIsticApp.finalResult.exam" for="field_exam">Exam</label>
<select class="form-control" id="field_exam" name="exam" formControlName="examId">
<option [ngValue]="null"></option>
<option [ngValue]="examOption.id" *ngFor="let examOption of exams; trackBy: trackById">{{ examOption.name }}</option>
</select>
</select>
</div>
</div>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,16 @@

<div class="row mb-3" [hidden]="editForm.get('id')!.value == null">
<label class="form-label" jhiTranslate="global.field.id" for="field_id">ID</label>
<input type="number" class="form-control" name="id" id="field_id" data-cy="id" formControlName="id" [readonly]="true" />
<input
type="number"
(mouseup)="$event.stopPropagation()"
class="form-control"
name="id"
id="field_id"
data-cy="id"
formControlName="id"
[readonly]="true"
/>
</div>

<div class="row mb-3">
Expand Down Expand Up @@ -49,7 +58,15 @@

<div class="row mb-3">
<label class="form-label" jhiTranslate="gradeScopeIsticApp.gradedComment.grade" for="field_grade">Grade</label>
<input type="number" class="form-control" name="grade" id="field_grade" data-cy="grade" formControlName="grade" />
<input
type="number"
(mouseup)="$event.stopPropagation()"
class="form-control"
name="grade"
id="field_grade"
data-cy="grade"
formControlName="grade"
/>
</div>

<div class="row mb-3">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,16 @@

<div class="row mb-3" *ngIf="editForm.controls.id.value !== null">
<label class="form-label" jhiTranslate="global.field.id" for="field_id">ID</label>
<input type="number" class="form-control" name="id" id="field_id" data-cy="id" formControlName="id" [readonly]="true" />
<input
type="number"
(mouseup)="$event.stopPropagation()"
class="form-control"
name="id"
id="field_id"
data-cy="id"
formControlName="id"
[readonly]="true"
/>
</div>

<div class="row mb-3">
Expand All @@ -37,7 +46,15 @@

<div class="row mb-3">
<label class="form-label" jhiTranslate="gradeScopeIsticApp.hybridGradedComment.grade" for="field_grade">Grade</label>
<input type="number" class="form-control" name="grade" id="field_grade" data-cy="grade" formControlName="grade" />
<input
type="number"
(mouseup)="$event.stopPropagation()"
class="form-control"
name="grade"
id="field_grade"
data-cy="grade"
formControlName="grade"
/>
</div>

<div class="row mb-3">
Expand All @@ -47,7 +64,15 @@

<div class="row mb-3">
<label class="form-label" jhiTranslate="gradeScopeIsticApp.hybridGradedComment.step" for="field_step">Step</label>
<input type="number" class="form-control" name="step" id="field_step" data-cy="step" formControlName="step" />
<input
type="number"
(mouseup)="$event.stopPropagation()"
class="form-control"
name="step"
id="field_step"
data-cy="step"
formControlName="step"
/>
</div>

<div class="row mb-3">
Expand Down
Loading

0 comments on commit b4e3df2

Please sign in to comment.