@@ -66,7 +66,7 @@
{{ 'addon.mod_assign.duedate' | translate }}
{{ assign!.duedate * 1000 | coreFormatDate }}
diff --git a/src/addons/mod/assign/components/submission/submission.ts b/src/addons/mod/assign/components/submission/submission.ts index e98b0c5a8..75e78f0d7 100644 --- a/src/addons/mod/assign/components/submission/submission.ts +++ b/src/addons/mod/assign/components/submission/submission.ts @@ -122,6 +122,7 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy, Can allowAddAttempt = false; // Allow adding a new attempt when grading. gradeUrl?: string; // URL to grade in browser. isPreviousAttemptEmpty = true; // Whether the previous attempt contains an empty submission. + showDates = false; // Whether to show some dates. // Some constants. statusNew = AddonModAssignProvider.SUBMISSION_STATUS_NEW; @@ -181,6 +182,7 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy, Can */ ngOnInit(): void { this.isSubmittedForGrading = !!this.submitId; + this.showDates = !CoreSites.getCurrentSite()?.isVersionGreaterEqualThan('3.11'); this.loadData(true); } diff --git a/src/addons/mod/assign/lang.json b/src/addons/mod/assign/lang.json index 5311cdf8a..37a598c17 100644 --- a/src/addons/mod/assign/lang.json +++ b/src/addons/mod/assign/lang.json @@ -95,10 +95,9 @@ "ungroupedusers": "The setting 'Require group to make submission' is enabled and some users are either not a member of any group, or are a member of more than one group, so are unable to make submissions.", "ungroupedusersoptional": "The setting 'Students submit in groups' is enabled and some users are either not a member of any group, or are a member of more than one group. Please be aware that these students will submit as members of the 'Default group'.", "unlimitedattempts": "Unlimited", - "userwithid": "User with ID {{id}}", "userswhoneedtosubmit": "Users who need to submit: {{$a}}", "viewsubmission": "View submission", "warningsubmissionmodified": "The user submission was modified on the site.", "warningsubmissiongrademodified": "The submission grade was modified on the site.", "wordlimit": "Word limit" -} \ No newline at end of file +} diff --git a/src/addons/mod/book/components/index/addon-mod-book-index.html b/src/addons/mod/book/components/index/addon-mod-book-index.html index 83c7ae129..263711c8b 100644 --- a/src/addons/mod/book/components/index/addon-mod-book-index.html +++ b/src/addons/mod/book/components/index/addon-mod-book-index.html @@ -23,6 +23,11 @@
-
- ![]()
-
+
+
+
+ {{ 'core.course.completion_automatic:done' | translate }} {{ rule.rulevalue.description }}
+
+
+
+ {{ 'core.course.completion_automatic:failed' | translate }} {{ rule.rulevalue.description }}
+
+
+
+ {{ 'core.course.completion_automatic:todo' | translate }} {{ rule.rulevalue.description }}
+
+
+
+
+
+
+ {{ rule.rulevalue.description }}
+
+
+
+
+
+
+
+
+ + {{ date.label }} {{ date.timestamp * 1000 | coreFormatDate:'strftimedatetime' }} +
+
+
+
+
+
+
+ {{ 'core.course.completion_manual:done' | translate }}
+
+
+
+
+ {{ 'core.course.completion_manual:markdone' | translate }}
+
+
+
+
+
+
+ {{ 'core.course.completion_manual:markdone' | translate }}
+
+
+
diff --git a/src/core/features/course/components/module-manual-completion/module-manual-completion.scss b/src/core/features/course/components/module-manual-completion/module-manual-completion.scss
new file mode 100644
index 000000000..0aa279fc8
--- /dev/null
+++ b/src/core/features/course/components/module-manual-completion/module-manual-completion.scss
@@ -0,0 +1,5 @@
+:host {
+ ion-button {
+ text-transform: none;
+ }
+}
diff --git a/src/core/features/course/components/module-manual-completion/module-manual-completion.ts b/src/core/features/course/components/module-manual-completion/module-manual-completion.ts
new file mode 100644
index 000000000..68e8ff927
--- /dev/null
+++ b/src/core/features/course/components/module-manual-completion/module-manual-completion.ts
@@ -0,0 +1,112 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import { Component, EventEmitter, Input, OnChanges, OnDestroy, OnInit, Output, SimpleChange } from '@angular/core';
+
+import { CoreCourseHelper, CoreCourseModuleCompletionData } from '@features/course/services/course-helper';
+import { CoreUser } from '@features/user/services/user';
+import { Translate } from '@singletons';
+import { CoreEventObserver, CoreEvents } from '@singletons/events';
+
+/**
+ * Component to display a button for manual completion.
+ */
+@Component({
+ selector: 'core-course-module-manual-completion',
+ templateUrl: 'core-course-module-manual-completion.html',
+ styleUrls: ['module-manual-completion.scss'],
+})
+export class CoreCourseModuleManualCompletionComponent implements OnInit, OnChanges, OnDestroy {
+
+ @Input() completion?: CoreCourseModuleCompletionData; // The completion status.
+ @Input() moduleName?: string; // The name of the module this completion affects.
+ @Output() completionChanged = new EventEmitter