Skip to content

Commit 40ee496

Browse files
committed
MOBILE-3671 assign: Move constants
1 parent 164874e commit 40ee496

File tree

30 files changed

+188
-160
lines changed

30 files changed

+188
-160
lines changed

src/addons/mod/assign/assign.module.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@ import { CorePushNotificationsDelegate } from '@features/pushnotifications/servi
2323
import { CoreCronDelegate } from '@services/cron';
2424
import { CORE_SITE_SCHEMAS } from '@services/sites';
2525
import { AddonModAssignFeedbackModule } from './feedback/feedback.module';
26-
import { OFFLINE_SITE_SCHEMA } from './services/database/assign';
26+
import { ADDON_MOD_ASSIGN_OFFLINE_SITE_SCHEMA } from './services/database/assign';
2727
import { AddonModAssignIndexLinkHandler } from './services/handlers/index-link';
2828
import { AddonModAssignListLinkHandler } from './services/handlers/list-link';
2929
import { AddonModAssignModuleHandler } from './services/handlers/module';
3030
import { AddonModAssignPrefetchHandler } from './services/handlers/prefetch';
3131
import { AddonModAssignPushClickHandler } from './services/handlers/push-click';
3232
import { AddonModAssignSyncCronHandler } from './services/handlers/sync-cron';
3333
import { AddonModAssignSubmissionModule } from './submission/submission.module';
34-
import { ADDON_MOD_ASSIGN_COMPONENT, ADDON_MOD_ASSIGN_PAGE_NAME } from './constants';
34+
import { ADDON_MOD_ASSIGN_COMPONENT_LEGACY, ADDON_MOD_ASSIGN_PAGE_NAME } from './constants';
3535
import { conditionalRoutes } from '@/app/app-routing.module';
3636
import { canLeaveGuard } from '@guards/can-leave';
3737
import { CoreScreen } from '@services/screen';
@@ -133,7 +133,7 @@ const routes: Routes = [
133133
providers: [
134134
{
135135
provide: CORE_SITE_SCHEMAS,
136-
useValue: [OFFLINE_SITE_SCHEMA],
136+
useValue: [ADDON_MOD_ASSIGN_OFFLINE_SITE_SCHEMA],
137137
multi: true,
138138
},
139139
{
@@ -147,7 +147,7 @@ const routes: Routes = [
147147
CoreCronDelegate.register(AddonModAssignSyncCronHandler.instance);
148148
CorePushNotificationsDelegate.registerClickHandler(AddonModAssignPushClickHandler.instance);
149149

150-
CoreCourseHelper.registerModuleReminderClick(ADDON_MOD_ASSIGN_COMPONENT);
150+
CoreCourseHelper.registerModuleReminderClick(ADDON_MOD_ASSIGN_COMPONENT_LEGACY);
151151
},
152152
},
153153
],

src/addons/mod/assign/classes/submissions-source.ts

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,17 @@ import { CoreEvents } from '@singletons/events';
2323
import {
2424
AddonModAssign,
2525
AddonModAssignAssign,
26-
AddonModAssignGradingStates,
2726
AddonModAssignSubmission,
28-
AddonModAssignSubmissionStatusValues,
2927
} from '../services/assign';
3028
import { AddonModAssignHelper, AddonModAssignSubmissionFormatted } from '../services/assign-helper';
3129
import { AddonModAssignOffline } from '../services/assign-offline';
3230
import { AddonModAssignSync } from '../services/assign-sync';
33-
import { ADDON_MOD_ASSIGN_MANUAL_SYNCED } from '../constants';
31+
import {
32+
ADDON_MOD_ASSIGN_MANUAL_SYNCED,
33+
AddonModAssignGradingStates,
34+
AddonModAssignListFilterName,
35+
AddonModAssignSubmissionStatusValues,
36+
} from '../constants';
3437

3538
/**
3639
* Provides a collection of assignment submissions.
@@ -256,13 +259,3 @@ export type AddonModAssignSubmissionForList = AddonModAssignSubmissionFormatted
256259
gradingStatusTranslationId?: string; // Calculated in the app. Key of the text of the submission grading status.
257260
needsGrading?: boolean; // Calculated in the app. If submission and grading status means that it needs grading.
258261
};
259-
260-
/**
261-
* List filter by status name.
262-
*/
263-
export enum AddonModAssignListFilterName {
264-
ALL = '',
265-
NEED_GRADING = 'needgrading',
266-
DRAFT = 'draft',
267-
SUBMITTED = 'submitted',
268-
}

src/addons/mod/assign/components/edit-feedback-modal/edit-feedback-modal.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ import { ModalController, Translate } from '@singletons';
1717
import {
1818
AddonModAssign,
1919
AddonModAssignAssign,
20-
AddonModAssignAttemptReopenMethodValues,
21-
AddonModAssignGradingStates,
2220
AddonModAssignSavePluginData,
2321
AddonModAssignSubmissionFeedback,
2422
} from '../../services/assign';
@@ -30,6 +28,8 @@ import {
3028
ADDON_MOD_ASSIGN_COMPONENT,
3129
ADDON_MOD_ASSIGN_GRADED_EVENT,
3230
ADDON_MOD_ASSIGN_UNLIMITED_ATTEMPTS,
31+
AddonModAssignAttemptReopenMethodValues,
32+
AddonModAssignGradingStates,
3333
} from '../../constants';
3434
import { CoreCourse, CoreCourseModuleGradeInfo, CoreCourseModuleGradeOutcome } from '@features/course/services/course';
3535
import { AddonModAssignHelper, AddonModAssignSubmissionFormatted } from '../../services/assign-helper';

src/addons/mod/assign/components/feedback-plugin/feedback-plugin.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import {
2424
} from '../../services/assign';
2525
import { AddonModAssignHelper, AddonModAssignPluginConfig } from '../../services/assign-helper';
2626
import { AddonModAssignFeedbackDelegate } from '../../services/feedback-delegate';
27-
import { ADDON_MOD_ASSIGN_COMPONENT } from '../../constants';
27+
import { ADDON_MOD_ASSIGN_COMPONENT_LEGACY } from '../../constants';
2828
import { toBoolean } from '@/core/transforms/boolean';
2929
import { CoreSharedModule } from '@/core/shared.module';
3030

@@ -54,7 +54,7 @@ export class AddonModAssignFeedbackPluginComponent implements OnInit {
5454
data?: AddonModAssignFeedbackPluginData; // Data to pass to the component.
5555

5656
// Data to render the plugin if it isn't supported.
57-
component = ADDON_MOD_ASSIGN_COMPONENT;
57+
component = ADDON_MOD_ASSIGN_COMPONENT_LEGACY;
5858
text = '';
5959
files: CoreWSFile[] = [];
6060
notSupported = false;

src/addons/mod/assign/components/index/index.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ import { CorePromiseUtils } from '@singletons/promise-utils';
2727
import { Translate } from '@singletons';
2828
import { CoreEventObserver, CoreEvents } from '@singletons/events';
2929
import { CoreTime } from '@singletons/time';
30-
import { AddonModAssignListFilterName } from '../../classes/submissions-source';
3130
import {
3231
AddonModAssign,
3332
AddonModAssignAssign,
@@ -42,15 +41,17 @@ import {
4241
import { AddonModAssignSubmissionComponent } from '../submission/submission';
4342
import {
4443
ADDON_MOD_ASSIGN_AUTO_SYNCED,
45-
ADDON_MOD_ASSIGN_COMPONENT,
44+
ADDON_MOD_ASSIGN_COMPONENT_LEGACY,
4645
ADDON_MOD_ASSIGN_GRADED_EVENT,
46+
ADDON_MOD_ASSIGN_MODNAME,
4747
ADDON_MOD_ASSIGN_PAGE_NAME,
4848
ADDON_MOD_ASSIGN_STARTED_EVENT,
4949
ADDON_MOD_ASSIGN_SUBMISSION_REMOVED_EVENT,
5050
ADDON_MOD_ASSIGN_SUBMISSION_SAVED_EVENT,
5151
ADDON_MOD_ASSIGN_SUBMITTED_FOR_GRADING_EVENT,
5252
ADDON_MOD_ASSIGN_WARN_GROUPS_OPTIONAL,
5353
ADDON_MOD_ASSIGN_WARN_GROUPS_REQUIRED,
54+
AddonModAssignListFilterName,
5455
} from '../../constants';
5556
import { CoreAlerts } from '@services/overlays/alerts';
5657
import { CoreSharedModule } from '@/core/shared.module';
@@ -75,8 +76,8 @@ export class AddonModAssignIndexComponent extends CoreCourseModuleMainActivityCo
7576

7677
@ViewChild(AddonModAssignSubmissionComponent) submissionComponent?: AddonModAssignSubmissionComponent;
7778

78-
component = ADDON_MOD_ASSIGN_COMPONENT;
79-
pluginName = 'assign';
79+
component = ADDON_MOD_ASSIGN_COMPONENT_LEGACY;
80+
pluginName = ADDON_MOD_ASSIGN_MODNAME;
8081

8182
assign?: AddonModAssignAssign; // The assign object.
8283
canViewAllSubmissions = false; // Whether the user can view all submissions.

src/addons/mod/assign/components/submission-plugin/submission-plugin.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import { AddonModAssignHelper, AddonModAssignPluginConfig } from '../../services
2424
import { AddonModAssignSubmissionDelegate } from '../../services/submission-delegate';
2525
import { CoreFileEntry } from '@services/file-helper';
2626
import type { AddonModAssignSubmissionPluginBaseComponent } from '@addons/mod/assign/classes/base-submission-plugin-component';
27-
import { ADDON_MOD_ASSIGN_COMPONENT } from '../../constants';
27+
import { ADDON_MOD_ASSIGN_COMPONENT_LEGACY } from '../../constants';
2828
import { toBoolean } from '@/core/transforms/boolean';
2929
import { CoreSharedModule } from '@/core/shared.module';
3030

@@ -53,7 +53,7 @@ export class AddonModAssignSubmissionPluginComponent implements OnChanges {
5353
data?: AddonModAssignSubmissionPluginData; // Data to pass to the component.
5454

5555
// Data to render the plugin if it isn't supported.
56-
component = ADDON_MOD_ASSIGN_COMPONENT;
56+
component = ADDON_MOD_ASSIGN_COMPONENT_LEGACY;
5757
text = '';
5858
files: CoreFileEntry[] = [];
5959
notSupported = false;

src/addons/mod/assign/components/submission/submission.ts

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,6 @@ import {
2323
AddonModAssignPlugin,
2424
AddonModAssign,
2525
AddonModAssignGetSubmissionStatusWSResponse,
26-
AddonModAssignGradingStates,
27-
AddonModAssignSubmissionStatusValues,
28-
AddonModAssignAttemptReopenMethodValues,
2926
AddonModAssignGrade,
3027
} from '../../services/assign';
3128
import {
@@ -47,11 +44,15 @@ import { AddonModAssignSubmissionPluginComponent } from '../submission-plugin/su
4744
import { CoreTime } from '@singletons/time';
4845
import { CoreIonicColorNames } from '@singletons/colors';
4946
import {
50-
ADDON_MOD_ASSIGN_COMPONENT,
47+
ADDON_MOD_ASSIGN_COMPONENT_LEGACY,
5148
ADDON_MOD_ASSIGN_MANUAL_SYNCED,
49+
ADDON_MOD_ASSIGN_MODNAME,
5250
ADDON_MOD_ASSIGN_PAGE_NAME,
5351
ADDON_MOD_ASSIGN_SUBMISSION_REMOVED_EVENT,
5452
ADDON_MOD_ASSIGN_SUBMITTED_FOR_GRADING_EVENT,
53+
AddonModAssignAttemptReopenMethodValues,
54+
AddonModAssignGradingStates,
55+
AddonModAssignSubmissionStatusValues,
5556
} from '../../constants';
5657
import { CoreViewer } from '@features/viewer/services/viewer';
5758
import { CoreLoadings } from '@services/overlays/loadings';
@@ -353,7 +354,7 @@ export class AddonModAssignSubmissionComponent implements OnInit {
353354
const sent = await AddonModAssign.removeSubmission(this.assign, this.userSubmission);
354355

355356
if (sent) {
356-
CoreEvents.trigger(CoreEvents.ACTIVITY_DATA_SENT, { module: 'assign' });
357+
CoreEvents.trigger(CoreEvents.ACTIVITY_DATA_SENT, { module: ADDON_MOD_ASSIGN_MODNAME });
357358
}
358359

359360
CoreEvents.trigger(
@@ -751,7 +752,7 @@ export class AddonModAssignSubmissionComponent implements OnInit {
751752
Translate.instant('core.grades.grade'),
752753
grade,
753754
{
754-
component: ADDON_MOD_ASSIGN_COMPONENT,
755+
component: ADDON_MOD_ASSIGN_COMPONENT_LEGACY,
755756
componentId: this.moduleId,
756757
},
757758
);

src/addons/mod/assign/constants.ts

Lines changed: 56 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,15 @@
1414

1515
export const ADDON_MOD_ASSIGN_FEATURE_NAME = 'CoreCourseModuleDelegate_AddonModAssign';
1616

17-
export const ADDON_MOD_ASSIGN_COMPONENT = 'mmaModAssign';
17+
export const ADDON_MOD_ASSIGN_COMPONENT_LEGACY = 'mmaModAssign';
18+
export const ADDON_MOD_ASSIGN_COMPONENT = 'AddonModAssign';
19+
1820
export const ADDON_MOD_ASSIGN_PAGE_NAME = 'mod_assign';
21+
export const ADDON_MOD_ASSIGN_MODNAME = 'assign';
22+
23+
export const ADDON_MOD_ASSIGN_PREFETCH_NAME = ADDON_MOD_ASSIGN_COMPONENT;
24+
25+
export const ADDON_MOD_ASSIGN_SYNC_CRON_NAME = 'AddonModAssignSyncCronHandler';
1926

2027
export const ADDON_MOD_ASSIGN_UNLIMITED_ATTEMPTS = -1;
2128

@@ -31,3 +38,51 @@ export const ADDON_MOD_ASSIGN_GRADED_EVENT = 'addon_mod_assign_graded';
3138
export const ADDON_MOD_ASSIGN_STARTED_EVENT = 'addon_mod_assign_started';
3239
export const ADDON_MOD_ASSIGN_AUTO_SYNCED = 'addon_mod_assign_autom_synced';
3340
export const ADDON_MOD_ASSIGN_MANUAL_SYNCED = 'addon_mod_assign_manual_synced';
41+
42+
/**
43+
* Submission status.
44+
* Constants on LMS starting with ASSIGN_SUBMISSION_STATUS_
45+
*/
46+
export const enum AddonModAssignSubmissionStatusValues {
47+
SUBMITTED = 'submitted',
48+
DRAFT = 'draft',
49+
NEW = 'new',
50+
REOPENED = 'reopened',
51+
// Added by App Statuses.
52+
NO_ATTEMPT = 'noattempt',
53+
NO_ONLINE_SUBMISSIONS = 'noonlinesubmissions',
54+
NO_SUBMISSION = 'nosubmission',
55+
GRADED_FOLLOWUP_SUBMIT = 'gradedfollowupsubmit',
56+
}
57+
58+
/**
59+
* Grading status.
60+
* Constants on LMS starting with ASSIGN_GRADING_STATUS_
61+
*/
62+
export const enum AddonModAssignGradingStates {
63+
GRADED = 'graded',
64+
NOT_GRADED = 'notgraded',
65+
// Added by App Statuses.
66+
MARKING_WORKFLOW_STATE_RELEASED = 'released', // with ASSIGN_MARKING_WORKFLOW_STATE_RELEASED
67+
GRADED_FOLLOWUP_SUBMIT = 'gradedfollowupsubmit',
68+
}
69+
70+
/**
71+
* Reopen attempt methods.
72+
* Constants on LMS starting with ASSIGN_ATTEMPT_REOPEN_METHOD_
73+
*/
74+
export const enum AddonModAssignAttemptReopenMethodValues {
75+
NONE = 'none',
76+
MANUAL = 'manual',
77+
UNTILPASS = 'untilpass',
78+
}
79+
80+
/**
81+
* List filter by status name.
82+
*/
83+
export const enum AddonModAssignListFilterName {
84+
ALL = '',
85+
NEED_GRADING = 'needgrading',
86+
DRAFT = 'draft',
87+
SUBMITTED = 'submitted',
88+
}

src/addons/mod/assign/feedback/comments/component/comments.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import { AddonModAssignOffline } from '@addons/mod/assign/services/assign-offlin
2626
import { CorePromiseUtils } from '@singletons/promise-utils';
2727
import { AddonModAssignFeedbackPluginBaseComponent } from '@addons/mod/assign/classes/base-feedback-plugin-component';
2828
import { ContextLevel } from '@/core/constants';
29-
import { ADDON_MOD_ASSIGN_COMPONENT } from '@addons/mod/assign/constants';
29+
import { ADDON_MOD_ASSIGN_COMPONENT_LEGACY } from '@addons/mod/assign/constants';
3030
import { CoreViewer } from '@features/viewer/services/viewer';
3131
import { CoreEditorRichTextEditorComponent } from '@features/editor/components/rich-text-editor/rich-text-editor';
3232
import { CoreSharedModule } from '@/core/shared.module';
@@ -46,7 +46,7 @@ import { CoreSharedModule } from '@/core/shared.module';
4646
export class AddonModAssignFeedbackCommentsComponent extends AddonModAssignFeedbackPluginBaseComponent implements OnInit {
4747

4848
control?: FormControl<string>;
49-
component = ADDON_MOD_ASSIGN_COMPONENT;
49+
component = ADDON_MOD_ASSIGN_COMPONENT_LEGACY;
5050
text = '';
5151
isSent = false;
5252
loaded = false;

src/addons/mod/assign/feedback/editpdf/component/editpdf.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
// limitations under the License.
1414

1515
import { AddonModAssignFeedbackPluginBaseComponent } from '@addons/mod/assign/classes/base-feedback-plugin-component';
16-
import { ADDON_MOD_ASSIGN_COMPONENT } from '@addons/mod/assign/constants';
16+
import { ADDON_MOD_ASSIGN_COMPONENT_LEGACY } from '@addons/mod/assign/constants';
1717
import { AddonModAssign } from '@addons/mod/assign/services/assign';
1818
import { Component, OnInit } from '@angular/core';
1919
import { CoreWSFile } from '@services/ws';
@@ -32,7 +32,7 @@ import { CoreSharedModule } from '@/core/shared.module';
3232
})
3333
export class AddonModAssignFeedbackEditPdfComponent extends AddonModAssignFeedbackPluginBaseComponent implements OnInit {
3434

35-
component = ADDON_MOD_ASSIGN_COMPONENT;
35+
component = ADDON_MOD_ASSIGN_COMPONENT_LEGACY;
3636
files: CoreWSFile[] = [];
3737

3838
/**

0 commit comments

Comments
 (0)