Skip to content

Commit

Permalink
Fix #700 mobile app.
Browse files Browse the repository at this point in the history 
display warning when no students are available to take attendance.
  • Loading branch information
@danmarsden
danmarsden committed Nov 19, 2024
1 parent 3d15ff4 commit 23c561f
Show file tree
Hide file tree
Showing 4 changed files with 78 additions and 67 deletions.
1 change: 1 addition & 0 deletions db/mobile.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@
['incorrectpasswordshort', 'attendance'],
['attendancesuccess', 'attendance'],
['setallstatuses', 'attendance'],
['nousers', 'attendance'],
],
],
];
1 change: 1 addition & 0 deletions lang/en/attendance.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -681,3 +681,4 @@
$string['weekcommencing'] = 'Week commencing';
$string['weeks'] = 'Weeks';
$string['youcantdo'] = 'You can\'t do anything';
$string['nousers'] = 'No enrolled users found to take attendance for.';
74 changes: 39 additions & 35 deletions templates/mobile_teacher_form_ionic5.mustache
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,47 +58,51 @@
</span>
<%/messages%>
<%/showmessage%>
<span class="attendance_selectall">
<ion-item class="ion-text-wrap">
<ion-label>{{ 'plugin.mod_attendance.setallstatuses' | translate }}</ion-label>
</ion-item>
<ion-radio-group [(ngModel)]="CONTENT_OTHERDATA.statusall" (ionChange)="<% selectall %>">
<%#statuses%>
<%#users.0%>
<span class="attendance_selectall">
<ion-item class="ion-text-wrap">
<ion-label>{{ 'plugin.mod_attendance.setallstatuses' | translate }}</ion-label>
</ion-item>
<ion-radio-group [(ngModel)]="CONTENT_OTHERDATA.statusall" (ionChange)="<% selectall %>">
<%#statuses%>

<span class="radiolabel">
<span class="radiolabel">
<ion-item class="ion-text-wrap">
<ion-label><% acronym %></ion-label>
<ion-radio value="<% stid %>"></ion-radio>
</ion-item>
</span>
<%/statuses%>
</ion-radio-group>
</span>
<%#users%>
<span class="attendance_user_row">
<!-- User and status of the submission. -->
<ion-item class="ion-text-wrap" title="<% fullname %>">
<ion-avatar slot="start">
<img src="<% profileimageurl %>" core-external-content role="presentation" onError="this.src='assets/img/user-avatar.png'">
</ion-avatar>
<ion-label>
<h2><% fullname %></h2>
</ion-label>
</ion-item>
<ion-radio-group [(ngModel)]="CONTENT_OTHERDATA.status<% userid %>">
<%#statuses%>
<span class="radiolabel">
<ion-item class="ion-text-wrap">
<ion-label><% acronym %></ion-label>
<ion-radio value="<% stid %>"></ion-radio>
</ion-item>
</span>
<%/statuses%>
<%/statuses%>
</ion-radio-group>
</span>
<%#users%>
<span class="attendance_user_row">
<!-- User and status of the submission. -->
<ion-item class="ion-text-wrap" title="<% fullname %>">
<ion-avatar slot="start">
<img src="<% profileimageurl %>" core-external-content role="presentation" onError="this.src='assets/img/user-avatar.png'">
</ion-avatar>
<ion-label>
<h2><% fullname %></h2>
</ion-label>
</ion-item>
<ion-radio-group [(ngModel)]="CONTENT_OTHERDATA.status<% userid %>">
<%#statuses%>
<span class="radiolabel">
<ion-item class="ion-text-wrap">
<ion-label><% acronym %></ion-label>
<ion-radio value="<% stid %>"></ion-radio>
</ion-item>
</span>
<%/statuses%>
</ion-radio-group>
</span>
<%/users%>
<ion-button class="ion-margin" expand="block" core-site-plugins-new-content component="mod_attendance" method="mobile_view_activity" [args]="{cmid: <% cmid %>, courseid: <% courseid %>, sessid: <% sessid %><% btnargs %>}">
{{ 'plugin.mod_attendance.submitattendance' | translate }}
</ion-button>

<%/users%>
<ion-button class="ion-margin" expand="block" core-site-plugins-new-content component="mod_attendance" method="mobile_view_activity" [args]="{cmid: <% cmid %>, courseid: <% courseid %>, sessid: <% sessid %><% btnargs %>}">
{{ 'plugin.mod_attendance.submitattendance' | translate }}
</ion-button>
<%/users.0%>
<%^users.0%>
<span>{{ 'plugin.mod_attendance.nousers' | translate }}</span>
<%/users.0%>
</div>
69 changes: 37 additions & 32 deletions templates/mobile_teacher_form_latest.mustache
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,45 +66,50 @@
</span>
<%/messages%>
<%/showmessage%>
<span class="attendance_selectall">
<ion-item class="ion-text-wrap">
<ion-label>{{ 'plugin.mod_attendance.setallstatuses' | translate }}</ion-label>
</ion-item>
<ion-radio-group [(ngModel)]="CONTENT_OTHERDATA.statusall" (ionChange)="<% selectall %>">
<%#statuses%>
<%#users.0%>
<span class="attendance_selectall">
<ion-item class="ion-text-wrap">
<ion-label>{{ 'plugin.mod_attendance.setallstatuses' | translate }}</ion-label>
</ion-item>
<ion-radio-group [(ngModel)]="CONTENT_OTHERDATA.statusall" (ionChange)="<% selectall %>">
<%#statuses%>

<span class="radiolabel">
<ion-item class="ion-text-wrap">
<ion-radio value="<% stid %>"><% acronym %></ion-radio>
</ion-item>
</span>
<%/statuses%>
</ion-radio-group>
</span>
<%#users%>
<span class="attendance_user_row">
<!-- User and status of the submission. -->
<ion-item class="ion-text-wrap" title="<% fullname %>">
<ion-avatar slot="start">
<img src="<% profileimageurl %>" core-external-content role="presentation" onError="this.src='assets/img/user-avatar.png'">
</ion-avatar>
<ion-label>
<h2><% fullname %></h2>
</ion-label>
</ion-item>
<ion-radio-group [(ngModel)]="CONTENT_OTHERDATA.status<% userid %>">
<%#statuses%>
<span class="radiolabel">
<ion-item class="ion-text-wrap">
<ion-radio value="<% stid %>"><% acronym %></ion-radio>
</ion-item>
</span>
<%/statuses%>
<%/statuses%>
</ion-radio-group>
</span>
<%#users%>
<span class="attendance_user_row">
<!-- User and status of the submission. -->
<ion-item class="ion-text-wrap" title="<% fullname %>">
<ion-avatar slot="start">
<img src="<% profileimageurl %>" core-external-content role="presentation" onError="this.src='assets/img/user-avatar.png'">
</ion-avatar>
<ion-label>
<h2><% fullname %></h2>
</ion-label>
</ion-item>
<ion-radio-group [(ngModel)]="CONTENT_OTHERDATA.status<% userid %>">
<%#statuses%>
<span class="radiolabel">
<ion-item class="ion-text-wrap">
<ion-radio value="<% stid %>"><% acronym %></ion-radio>
</ion-item>
</span>
<%/statuses%>
</ion-radio-group>
</span>
<%/users%>
<ion-button class="ion-margin" expand="block" core-site-plugins-new-content component="mod_attendance" method="mobile_view_activity" [args]="{cmid: <% cmid %>, courseid: <% courseid %>, sessid: <% sessid %><% btnargs %>}">
{{ 'plugin.mod_attendance.submitattendance' | translate }}
</ion-button>
<%/users%>
<ion-button class="ion-margin" expand="block" core-site-plugins-new-content component="mod_attendance" method="mobile_view_activity" [args]="{cmid: <% cmid %>, courseid: <% courseid %>, sessid: <% sessid %><% btnargs %>}">
{{ 'plugin.mod_attendance.submitattendance' | translate }}
</ion-button>
<%/users.0%>
<%^users.0%>
<span>{{ 'plugin.mod_attendance.nousers' | translate }}</span>
<%/users.0%>

</div>

0 comments on commit 23c561f

Please sign in to comment.