tutor-logic 5.0.0 → 20.0.0

package/fesm2022/tutor-logic.mjs

@@ -1,14 +1,14 @@
 import * as i0 from '@angular/core';
-import { NgModule, Injectable, Inject } from '@angular/core';
+import { NgModule, Inject, Injectable } from '@angular/core';
 import * as i1 from '@angular/common/http';
 import { tap, of } from 'rxjs';
 
 class TutorLogicModule {
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: TutorLogicModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule }); }
-    static { this.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "18.2.13", ngImport: i0, type: TutorLogicModule }); }
-    static { this.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: TutorLogicModule }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: TutorLogicModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule }); }
+    static { this.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "20.3.15", ngImport: i0, type: TutorLogicModule }); }
+    static { this.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: TutorLogicModule }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: TutorLogicModule, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: TutorLogicModule, decorators: [{
             type: NgModule,
             args: [{
                     declarations: [],
@@ -32,37 +32,10 @@ class TestsService {
     edit(model) {
         return this._httpClient.post(`${this.baseControllerUrl}/edit`, model);
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: TestsService, deps: [{ token: i1.HttpClient }, { token: 'BASE_URL' }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: TestsService, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: TestsService, deps: [{ token: i1.HttpClient }, { token: 'BASE_URL' }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: TestsService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: TestsService, decorators: [{
-            type: Injectable,
-            args: [{
-                    providedIn: 'root',
-                }]
-        }], ctorParameters: () => [{ type: i1.HttpClient }, { type: undefined, decorators: [{
-                    type: Inject,
-                    args: ['BASE_URL']
-                }] }] });
-
-class TutorCommonSettingsService {
-    constructor(_httpClient, baseUrl) {
-        this._httpClient = _httpClient;
-        this.baseControllerUrl = baseUrl + 'api/tutor/settings';
-    }
-    get(name) {
-        return this._httpClient.get(`${this.baseControllerUrl}/get/${name}`);
-    }
-    getCached(name) {
-        return this._httpClient.get(`${this.baseControllerUrl}/get/${name}/cached`);
-    }
-    set(model) {
-        return this._httpClient.post(`${this.baseControllerUrl}/set`, model);
-    }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: TutorCommonSettingsService, deps: [{ token: i1.HttpClient }, { token: 'BASE_URL' }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: TutorCommonSettingsService, providedIn: 'root' }); }
-}
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: TutorCommonSettingsService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: TestsService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
@@ -84,7 +57,7 @@ class StudentGroupQueryService {
         this._baseUrl = _baseUrl;
     }
     /**
-     * Поиск групп студентов
+     * Поиск групп учеников
      */
     search(model) {
         return this._httpClient.post(`${this.getBaseUrl()}/query/search`, model);
@@ -120,10 +93,10 @@ class StudentGroupQueryService {
     getStudentById(groupId, studentId) {
         return this._httpClient.get(`${this.getBaseUrl()}/students/get-by-id/${groupId}/${studentId}`);
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: StudentGroupQueryService, deps: [{ token: i1.HttpClient }, { token: 'BASE_URL' }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: StudentGroupQueryService, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: StudentGroupQueryService, deps: [{ token: i1.HttpClient }, { token: 'BASE_URL' }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: StudentGroupQueryService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: StudentGroupQueryService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: StudentGroupQueryService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
@@ -147,10 +120,10 @@ class StudentQueryService {
     search(searchModel) {
         return this._httpClient.post(this.baseControllerUrl + 'Search', searchModel);
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: StudentQueryService, deps: [{ token: i1.HttpClient }, { token: 'BASE_URL' }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: StudentQueryService, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: StudentQueryService, deps: [{ token: i1.HttpClient }, { token: 'BASE_URL' }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: StudentQueryService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: StudentQueryService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: StudentQueryService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
@@ -163,18 +136,18 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.13", ngImpo
 class StudentGroupEnterService {
     constructor(_httpClient, baseUrl) {
         this._httpClient = _httpClient;
-        this.baseControllerUrl = baseUrl + 'api/tutor/student-group/enter/';
+        this._baseControllerUrl = baseUrl + 'api/tutor/student-group/enter';
     }
     enterViaCode(model) {
-        return this._httpClient.post(this.baseControllerUrl + 'ViaCode', model);
+        return this._httpClient.post(`${this._baseControllerUrl}/ViaCode`, model);
     }
     enterFreeOfCharge(id) {
-        return this._httpClient.post(this.baseControllerUrl + `FreeOfCharge/${id}`, {});
+        return this._httpClient.post(`${this._baseControllerUrl}/FreeOfCharge/${id}`, {});
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: StudentGroupEnterService, deps: [{ token: i1.HttpClient }, { token: 'BASE_URL' }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: StudentGroupEnterService, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: StudentGroupEnterService, deps: [{ token: i1.HttpClient }, { token: 'BASE_URL' }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: StudentGroupEnterService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: StudentGroupEnterService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: StudentGroupEnterService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
@@ -199,10 +172,10 @@ class TestSolutionQueryService {
     getSolutionById(id) {
         return this._httpClient.get(`${this._baseUrl}/Get/By/Id/${id}`);
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: TestSolutionQueryService, deps: [{ token: i1.HttpClient }, { token: 'BASE_URL' }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: TestSolutionQueryService, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: TestSolutionQueryService, deps: [{ token: i1.HttpClient }, { token: 'BASE_URL' }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: TestSolutionQueryService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: TestSolutionQueryService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: TestSolutionQueryService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
@@ -239,10 +212,10 @@ class TestSolutionResultService {
     removeQuestionResult(model) {
         return this._httpClient.post(`${this.baseControllerUrl}/question/validation/remove`, model);
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: TestSolutionResultService, deps: [{ token: i1.HttpClient }, { token: 'BASE_URL' }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: TestSolutionResultService, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: TestSolutionResultService, deps: [{ token: i1.HttpClient }, { token: 'BASE_URL' }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: TestSolutionResultService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: TestSolutionResultService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: TestSolutionResultService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
@@ -266,10 +239,10 @@ class StudentTestSolutionStartService {
     startByErrors(model) {
         return this._httpClient.post(`${this.baseControllerUrl}/By/Errors`, model);
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: StudentTestSolutionStartService, deps: [{ token: i1.HttpClient }, { token: 'BASE_URL' }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: StudentTestSolutionStartService, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: StudentTestSolutionStartService, deps: [{ token: i1.HttpClient }, { token: 'BASE_URL' }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: StudentTestSolutionStartService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: StudentTestSolutionStartService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: StudentTestSolutionStartService, decorators: [{
             type: Injectable,
             args: [{ providedIn: 'root' }]
         }], ctorParameters: () => [{ type: i1.HttpClient }, { type: undefined, decorators: [{
@@ -286,10 +259,10 @@ class OpenApiQuestionLikeService {
     search(model) {
         return this._httpClient.post(`${this._baseUrl}/search`, model);
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: OpenApiQuestionLikeService, deps: [{ token: i1.HttpClient }, { token: 'BASE_URL' }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: OpenApiQuestionLikeService, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: OpenApiQuestionLikeService, deps: [{ token: i1.HttpClient }, { token: 'BASE_URL' }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: OpenApiQuestionLikeService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: OpenApiQuestionLikeService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: OpenApiQuestionLikeService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
@@ -308,10 +281,10 @@ class OpenApiTestSolutionService {
     getById(id) {
         return this._httpClient.get(`${this._baseUrl}/${id}`);
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: OpenApiTestSolutionService, deps: [{ token: i1.HttpClient }, { token: 'BASE_URL' }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: OpenApiTestSolutionService, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: OpenApiTestSolutionService, deps: [{ token: i1.HttpClient }, { token: 'BASE_URL' }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: OpenApiTestSolutionService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: OpenApiTestSolutionService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: OpenApiTestSolutionService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
@@ -332,10 +305,10 @@ class StudentTestSolutionService {
     finishSolution(model) {
         return this._httpClient.post(this.baseControllerUrl + "finish", model);
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: StudentTestSolutionService, deps: [{ token: i1.HttpClient }, { token: 'BASE_URL' }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: StudentTestSolutionService, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: StudentTestSolutionService, deps: [{ token: i1.HttpClient }, { token: 'BASE_URL' }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: StudentTestSolutionService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: StudentTestSolutionService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: StudentTestSolutionService, decorators: [{
             type: Injectable,
             args: [{ providedIn: 'root' }]
         }], ctorParameters: () => [{ type: i1.HttpClient }, { type: undefined, decorators: [{
@@ -350,23 +323,23 @@ BasePath = api/tutor/test-solution/query/mine
 class StudentTestSolutionQueryService {
     constructor(_httpClient, baseUrl) {
         this._httpClient = _httpClient;
-        this.baseControllerUrl = baseUrl + 'api/tutor/test-solution/query/mine/';
+        this.baseControllerUrl = baseUrl + 'api/tutor/test-solution/query/mine';
     }
     search(model) {
-        return this._httpClient.post(this.baseControllerUrl + `search`, model);
+        return this._httpClient.post(`${this.baseControllerUrl}/search`, model);
     }
     getResultById(id) {
-        let url = this.baseControllerUrl + `Get/By/Id/${id}/result`;
+        let url = `${this.baseControllerUrl}/Get/By/Id/${id}/result`;
         return this._httpClient.get(url);
     }
     getByTestId(testId) {
-        let url = this.baseControllerUrl + `Get/By/TestId/${testId}`;
+        let url = `${this.baseControllerUrl}/Get/By/TestId/${testId}`;
         return this._httpClient.get(url);
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: StudentTestSolutionQueryService, deps: [{ token: i1.HttpClient }, { token: 'BASE_URL' }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: StudentTestSolutionQueryService, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: StudentTestSolutionQueryService, deps: [{ token: i1.HttpClient }, { token: 'BASE_URL' }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: StudentTestSolutionQueryService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: StudentTestSolutionQueryService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: StudentTestSolutionQueryService, decorators: [{
             type: Injectable,
             args: [{ providedIn: 'root' }]
         }], ctorParameters: () => [{ type: i1.HttpClient }, { type: undefined, decorators: [{
@@ -386,10 +359,10 @@ class StudentGroupTestRelationQueryService {
     getById(studentGroupId, testId) {
         return this._httpClient.get(`${this.getBaseUrl()}/getById/${testId}/${studentGroupId}`);
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: StudentGroupTestRelationQueryService, deps: [{ token: i1.HttpClient }, { token: 'BASE_URL' }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: StudentGroupTestRelationQueryService, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: StudentGroupTestRelationQueryService, deps: [{ token: i1.HttpClient }, { token: 'BASE_URL' }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: StudentGroupTestRelationQueryService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: StudentGroupTestRelationQueryService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: StudentGroupTestRelationQueryService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
@@ -417,10 +390,10 @@ class CuratorMessageTemplateService {
     search(model) {
         return this._httpClient.post(this.getBaseControllerUrl() + 'search', model);
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: CuratorMessageTemplateService, deps: [{ token: i1.HttpClient }, { token: 'BASE_URL' }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: CuratorMessageTemplateService, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: CuratorMessageTemplateService, deps: [{ token: i1.HttpClient }, { token: 'BASE_URL' }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: CuratorMessageTemplateService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: CuratorMessageTemplateService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: CuratorMessageTemplateService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
@@ -448,10 +421,10 @@ class CourseDeadlineWarningService {
     getStudentWarningsGrouped(model) {
         return this._httpClient.post(this.baseControllerUrl + `query/for-student/grouped`, model);
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: CourseDeadlineWarningService, deps: [{ token: i1.HttpClient }, { token: 'BASE_URL' }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: CourseDeadlineWarningService, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: CourseDeadlineWarningService, deps: [{ token: i1.HttpClient }, { token: 'BASE_URL' }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: CourseDeadlineWarningService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: CourseDeadlineWarningService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: CourseDeadlineWarningService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
@@ -488,50 +461,10 @@ class CourseThemeItemTestRestrictionService {
     getRemovingAllState(courseId) {
         return this._http.get(`${this.baseControllerUrl}/removing-all/${courseId}/state`);
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: CourseThemeItemTestRestrictionService, deps: [{ token: i1.HttpClient }, { token: 'BASE_URL' }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: CourseThemeItemTestRestrictionService, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: CourseThemeItemTestRestrictionService, deps: [{ token: i1.HttpClient }, { token: 'BASE_URL' }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: CourseThemeItemTestRestrictionService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: CourseThemeItemTestRestrictionService, decorators: [{
-            type: Injectable,
-            args: [{
-                    providedIn: 'root',
-                }]
-        }], ctorParameters: () => [{ type: i1.HttpClient }, { type: undefined, decorators: [{
-                    type: Inject,
-                    args: ['BASE_URL']
-                }] }] });
-
-/**
- * Методы контроллера Tutor.Api.Controllers.Subjects.SubjectMenuController
- *
- * Базовый урл = api/tutor/subject/menu
- *
- * Методы для работы с меню предмета
- */
-class SubjectMenuService {
-    constructor(_httpClient, baseUrl) {
-        this._httpClient = _httpClient;
-        this.baseControllerUrl = `${baseUrl}api/tutor/subject/menu`;
-    }
-    getByAliasOrId(idOrAlias) {
-        return this._httpClient.get(`${this.baseControllerUrl}/GetByAliasOrId?idOrAlias=${idOrAlias}`);
-    }
-    getByAliasOrIdCached(idOrAlias) {
-        return this._httpClient.get(`${this.baseControllerUrl}/GetByAliasOrId/Cached?idOrAlias=${idOrAlias}`);
-    }
-    update(model) {
-        return this._httpClient.post(`${this.baseControllerUrl}/Update`, model);
-    }
-    create(model) {
-        return this._httpClient.post(`${this.baseControllerUrl}/create`, model);
-    }
-    getMain() {
-        return this._httpClient.get(`${this.baseControllerUrl}/query/main`);
-    }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: SubjectMenuService, deps: [{ token: i1.HttpClient }, { token: 'BASE_URL' }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: SubjectMenuService, providedIn: 'root' }); }
-}
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: SubjectMenuService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: CourseThemeItemTestRestrictionService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
@@ -551,27 +484,30 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.13", ngImpo
 class SubjectQueryService {
     constructor(_httpClient, baseUrl) {
         this._httpClient = _httpClient;
-        this.baseControllerUrl = baseUrl + 'api/tutor/subject/query/';
+        this._baseControllerUrl = `${baseUrl}api/tutor/subject/query`;
     }
     getAll() {
-        return this._httpClient.get(this.baseControllerUrl + `GetAll`);
+        return this._httpClient.get(`${this._baseControllerUrl}/get-all`);
     }
     getAllCached() {
-        return this._httpClient.get(this.baseControllerUrl + `GetAll/Cached`);
+        return this._httpClient.get(`${this._baseControllerUrl}/get-all/cached`);
     }
-    getAllWithIconsCached(iconSetId) {
-        return this._httpClient.get(this.baseControllerUrl + `GetAll/with-icons/Cached?iconSetId=${iconSetId}`);
+    getAllWithClarifications() {
+        return this._httpClient.get(`${this._baseControllerUrl}/get-all/with-clarifications`);
+    }
+    getAllWithClarificationsCached() {
+        return this._httpClient.get(`${this._baseControllerUrl}/get-all/with-clarifications/cached`);
     }
     getByAliasOrId(id) {
-        return this._httpClient.get(this.baseControllerUrl + `GetByAliasOrId?idOrAlias=${id}`);
+        return this._httpClient.get(`${this._baseControllerUrl}/GetByAliasOrId?idOrAlias=${id}`);
     }
     getByAliasOrIdCached(idOrAlias) {
-        return this._httpClient.get(this.baseControllerUrl + `GetByAliasOrId/Cached?idOrAlias=${idOrAlias}`);
+        return this._httpClient.get(`${this._baseControllerUrl}/GetByAliasOrId/Cached?idOrAlias=${idOrAlias}`);
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: SubjectQueryService, deps: [{ token: i1.HttpClient }, { token: 'BASE_URL' }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: SubjectQueryService, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: SubjectQueryService, deps: [{ token: i1.HttpClient }, { token: 'BASE_URL' }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: SubjectQueryService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: SubjectQueryService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: SubjectQueryService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
@@ -591,21 +527,21 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.13", ngImpo
 class SubjectsService {
     constructor(_httpClient, baseUrl) {
         this._httpClient = _httpClient;
-        this.baseControllerUrl = baseUrl + 'api/tutor/subject/';
+        this.baseControllerUrl = baseUrl + 'api/tutor/subject';
     }
     create(model) {
-        return this._httpClient.post(this.baseControllerUrl + 'Create', model);
+        return this._httpClient.post(`${this.baseControllerUrl}/create`, model);
     }
     order(model) {
-        return this._httpClient.post(this.baseControllerUrl + 'order', model);
+        return this._httpClient.post(`${this.baseControllerUrl}/order`, model);
     }
     update(model) {
-        return this._httpClient.post(this.baseControllerUrl + 'Update', model);
+        return this._httpClient.post(`${this.baseControllerUrl}/update`, model);
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: SubjectsService, deps: [{ token: i1.HttpClient }, { token: 'BASE_URL' }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: SubjectsService, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: SubjectsService, deps: [{ token: i1.HttpClient }, { token: 'BASE_URL' }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: SubjectsService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: SubjectsService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: SubjectsService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
@@ -639,38 +575,10 @@ class CourseThemeItemTestRestrictionStudentService {
     searchStudents(model) {
         return this._http.post(this.baseControllerUrl + 'query/search', model);
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: CourseThemeItemTestRestrictionStudentService, deps: [{ token: i1.HttpClient }, { token: 'BASE_URL' }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: CourseThemeItemTestRestrictionStudentService, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: CourseThemeItemTestRestrictionStudentService, deps: [{ token: i1.HttpClient }, { token: 'BASE_URL' }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: CourseThemeItemTestRestrictionStudentService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: CourseThemeItemTestRestrictionStudentService, decorators: [{
-            type: Injectable,
-            args: [{
-                    providedIn: 'root',
-                }]
-        }], ctorParameters: () => [{ type: i1.HttpClient }, { type: undefined, decorators: [{
-                    type: Inject,
-                    args: ['BASE_URL']
-                }] }] });
-
-/**
- * Методы контроллера Tutor.Api.Controllers.Subjects.StudentSubjectViewController
- *
- * Базовый урл = api/tutor/student-subject-view
- *
- * Методы для построения меню предмета
- */
-class StudentSubjectViewService {
-    constructor(_httpClient, baseUrl) {
-        this._httpClient = _httpClient;
-        this.baseControllerUrl = baseUrl + 'api/tutor/student-subject-view/';
-    }
-    getV1(idOrAlias, iconSetId) {
-        return this._httpClient.get(this.baseControllerUrl + `get/v1?idOrAlias=${idOrAlias}&iconSetId=${iconSetId}`);
-    }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: StudentSubjectViewService, deps: [{ token: i1.HttpClient }, { token: 'BASE_URL' }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: StudentSubjectViewService, providedIn: 'root' }); }
-}
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: StudentSubjectViewService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: CourseThemeItemTestRestrictionStudentService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
@@ -699,10 +607,10 @@ class StudentCourseViewService {
     loadThemeSolutionsAndTestRestriction(studentProgressId, themeItemId) {
         return this._httpClient.get(this.baseControllerUrl + `load-theme-solutions-and-restriction?studentProgressId=${studentProgressId}&themeItemId=${themeItemId}`);
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: StudentCourseViewService, deps: [{ token: i1.HttpClient }, { token: 'BASE_URL' }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: StudentCourseViewService, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: StudentCourseViewService, deps: [{ token: i1.HttpClient }, { token: 'BASE_URL' }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: StudentCourseViewService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: StudentCourseViewService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: StudentCourseViewService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
@@ -729,10 +637,10 @@ class TestSolutionDetailedQueryService {
     get(id) {
         return this._httpClient.get(this._baseUrl + `Get/By/Id/${id}/detailed`);
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: TestSolutionDetailedQueryService, deps: [{ token: i1.HttpClient }, { token: 'BASE_URL' }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: TestSolutionDetailedQueryService, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: TestSolutionDetailedQueryService, deps: [{ token: i1.HttpClient }, { token: 'BASE_URL' }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: TestSolutionDetailedQueryService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: TestSolutionDetailedQueryService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: TestSolutionDetailedQueryService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
@@ -775,10 +683,10 @@ class CourseLandingPageQueryService {
     getByIdCached(id) {
         return this._httpClient.get(`${this._baseUrl}/get-by-id/cached?id=${id}`);
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: CourseLandingPageQueryService, deps: [{ token: i1.HttpClient }, { token: 'BASE_URL' }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: CourseLandingPageQueryService, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: CourseLandingPageQueryService, deps: [{ token: i1.HttpClient }, { token: 'BASE_URL' }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: CourseLandingPageQueryService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: CourseLandingPageQueryService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: CourseLandingPageQueryService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
@@ -812,10 +720,10 @@ class CourseOrderService {
     create(model) {
         return this._httpClient.post(`${this.baseControllerUrl}/create`, model);
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: CourseOrderService, deps: [{ token: i1.HttpClient }, { token: 'BASE_URL' }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: CourseOrderService, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: CourseOrderService, deps: [{ token: i1.HttpClient }, { token: 'BASE_URL' }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: CourseOrderService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: CourseOrderService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: CourseOrderService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
@@ -842,10 +750,10 @@ class CourseShopWindowDetailedService {
     getByIdCached(id) {
         return this._httpClient.get(`${this.baseControllerUrl}/by-id/${id}/cached`);
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: CourseShopWindowDetailedService, deps: [{ token: i1.HttpClient }, { token: 'BASE_URL' }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: CourseShopWindowDetailedService, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: CourseShopWindowDetailedService, deps: [{ token: i1.HttpClient }, { token: 'BASE_URL' }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: CourseShopWindowDetailedService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: CourseShopWindowDetailedService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: CourseShopWindowDetailedService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
@@ -874,10 +782,10 @@ class StudentGroupPaymentPlanQueryService {
     getPaymentPlans(id) {
         return this._httpClient.get(`${this.getBaseUrl()}/payment-plans/${id}`);
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: StudentGroupPaymentPlanQueryService, deps: [{ token: i1.HttpClient }, { token: 'BASE_URL' }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: StudentGroupPaymentPlanQueryService, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: StudentGroupPaymentPlanQueryService, deps: [{ token: i1.HttpClient }, { token: 'BASE_URL' }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: StudentGroupPaymentPlanQueryService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: StudentGroupPaymentPlanQueryService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: StudentGroupPaymentPlanQueryService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
@@ -927,10 +835,10 @@ class TutorAppConfigurationService {
         }
         return of(value);
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: TutorAppConfigurationService, deps: [{ token: i1.HttpClient }, { token: 'BASE_URL' }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: TutorAppConfigurationService, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: TutorAppConfigurationService, deps: [{ token: i1.HttpClient }, { token: 'BASE_URL' }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: TutorAppConfigurationService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: TutorAppConfigurationService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: TutorAppConfigurationService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
@@ -951,10 +859,10 @@ class QuestionLikeService {
     getBySolutionId(id) {
         return this._httpClient.get(this.baseControllerUrl + `for-solution/${id}`);
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: QuestionLikeService, deps: [{ token: i1.HttpClient }, { token: 'BASE_URL' }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: QuestionLikeService, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: QuestionLikeService, deps: [{ token: i1.HttpClient }, { token: 'BASE_URL' }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: QuestionLikeService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: QuestionLikeService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: QuestionLikeService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
@@ -980,10 +888,10 @@ class StudentCourseProgressQueryService {
     search(model) {
         return this._httpClient.post(`${this.baseControllerUrl}/search`, model);
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: StudentCourseProgressQueryService, deps: [{ token: i1.HttpClient }, { token: 'BASE_URL' }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: StudentCourseProgressQueryService, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: StudentCourseProgressQueryService, deps: [{ token: i1.HttpClient }, { token: 'BASE_URL' }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: StudentCourseProgressQueryService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: StudentCourseProgressQueryService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: StudentCourseProgressQueryService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
@@ -1013,10 +921,10 @@ class StudentCourseProgressService {
     startTestForItemBlock(model) {
         return this._httpClient.post(`${this.baseControllerUrl}/theme/item/start-test`, model);
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: StudentCourseProgressService, deps: [{ token: i1.HttpClient }, { token: 'BASE_URL' }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: StudentCourseProgressService, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: StudentCourseProgressService, deps: [{ token: i1.HttpClient }, { token: 'BASE_URL' }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: StudentCourseProgressService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: StudentCourseProgressService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: StudentCourseProgressService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
@@ -1034,10 +942,10 @@ class StudentGroupMaterialService {
     getMaterials(model) {
         return this._httpClient.post(`${this.baseControllerUrl}/materials/search`, model);
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: StudentGroupMaterialService, deps: [{ token: i1.HttpClient }, { token: 'BASE_URL' }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: StudentGroupMaterialService, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: StudentGroupMaterialService, deps: [{ token: i1.HttpClient }, { token: 'BASE_URL' }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: StudentGroupMaterialService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: StudentGroupMaterialService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: StudentGroupMaterialService, decorators: [{
             type: Injectable,
             args: [{ providedIn: 'root' }]
         }], ctorParameters: () => [{ type: i1.HttpClient }, { type: undefined, decorators: [{
@@ -1056,10 +964,10 @@ class CoursePaymentService {
     setPaymentSystem(model) {
         return this._httpClient.post(`${this.baseControllerUrl}/set-payment-system`, model);
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: CoursePaymentService, deps: [{ token: i1.HttpClient }, { token: 'BASE_URL' }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: CoursePaymentService, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: CoursePaymentService, deps: [{ token: i1.HttpClient }, { token: 'BASE_URL' }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: CoursePaymentService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: CoursePaymentService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: CoursePaymentService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
@@ -1089,10 +997,10 @@ class CoursePaymentQueryService {
     getTypes() {
         return this._httpClient.get(this.baseControllerUrl + 'Types');
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: CoursePaymentQueryService, deps: [{ token: i1.HttpClient }, { token: 'BASE_URL' }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: CoursePaymentQueryService, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: CoursePaymentQueryService, deps: [{ token: i1.HttpClient }, { token: 'BASE_URL' }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: CoursePaymentQueryService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: CoursePaymentQueryService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: CoursePaymentQueryService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
@@ -1113,10 +1021,10 @@ class TestQuestionStatisticQueryService {
     getState() {
         return this._httpClient.get(`${this.baseControllerUrl}/state`);
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: TestQuestionStatisticQueryService, deps: [{ token: i1.HttpClient }, { token: 'BASE_URL' }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: TestQuestionStatisticQueryService, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: TestQuestionStatisticQueryService, deps: [{ token: i1.HttpClient }, { token: 'BASE_URL' }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: TestQuestionStatisticQueryService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: TestQuestionStatisticQueryService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: TestQuestionStatisticQueryService, decorators: [{
             type: Injectable,
             args: [{ providedIn: 'root' }]
         }], ctorParameters: () => [{ type: i1.HttpClient }, { type: undefined, decorators: [{
@@ -1132,10 +1040,10 @@ class StudentGroupCourseAccessService {
     get(model) {
         return this._httpClient.post(`${this.baseControllerUrl}/get`, model);
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: StudentGroupCourseAccessService, deps: [{ token: i1.HttpClient }, { token: 'BASE_URL' }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: StudentGroupCourseAccessService, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: StudentGroupCourseAccessService, deps: [{ token: i1.HttpClient }, { token: 'BASE_URL' }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: StudentGroupCourseAccessService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: StudentGroupCourseAccessService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: StudentGroupCourseAccessService, decorators: [{
             type: Injectable,
             args: [{ providedIn: 'root' }]
         }], ctorParameters: () => [{ type: i1.HttpClient }, { type: undefined, decorators: [{
@@ -1157,10 +1065,10 @@ class StudentRegistrationService {
     demoRegistration() {
         return this._httpClient.post(`${this._baseControllerUrl}/register/demo`, {});
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: StudentRegistrationService, deps: [{ token: i1.HttpClient }, { token: 'BASE_URL' }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: StudentRegistrationService, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: StudentRegistrationService, deps: [{ token: i1.HttpClient }, { token: 'BASE_URL' }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: StudentRegistrationService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: StudentRegistrationService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: StudentRegistrationService, decorators: [{
             type: Injectable,
             args: [{ providedIn: 'root' }]
         }], ctorParameters: () => [{ type: i1.HttpClient }, { type: undefined, decorators: [{
@@ -1188,10 +1096,10 @@ class PmtSystemService {
     createOrUpdate(model) {
         return this._http.post(`${this.baseControllerUrl}/create-or-update`, model);
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: PmtSystemService, deps: [{ token: i1.HttpClient }, { token: 'BASE_URL' }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: PmtSystemService, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: PmtSystemService, deps: [{ token: i1.HttpClient }, { token: 'BASE_URL' }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: PmtSystemService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: PmtSystemService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: PmtSystemService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
@@ -1209,10 +1117,10 @@ class DefaultCourseLandingPageQueryService {
     getById(id) {
         return this._httpClient.get(`${this._baseControllerUrl}/get-by-id/${id}`);
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: DefaultCourseLandingPageQueryService, deps: [{ token: i1.HttpClient }, { token: 'BASE_URL' }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: DefaultCourseLandingPageQueryService, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: DefaultCourseLandingPageQueryService, deps: [{ token: i1.HttpClient }, { token: 'BASE_URL' }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: DefaultCourseLandingPageQueryService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: DefaultCourseLandingPageQueryService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: DefaultCourseLandingPageQueryService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
@@ -1230,10 +1138,10 @@ class StudentGroupInfoPageService {
     get(model) {
         return this._httpClient.post(`${this.baseControllerUrl}/get`, model);
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: StudentGroupInfoPageService, deps: [{ token: i1.HttpClient }, { token: 'BASE_URL' }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: StudentGroupInfoPageService, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: StudentGroupInfoPageService, deps: [{ token: i1.HttpClient }, { token: 'BASE_URL' }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: StudentGroupInfoPageService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: StudentGroupInfoPageService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: StudentGroupInfoPageService, decorators: [{
             type: Injectable,
             args: [{ providedIn: 'root' }]
         }], ctorParameters: () => [{ type: i1.HttpClient }, { type: undefined, decorators: [{
@@ -1244,15 +1152,18 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.13", ngImpo
 class StudentAggregatedStatisticSnapshotService {
     constructor(_httpClient, baseUrl) {
         this._httpClient = _httpClient;
-        this.baseControllerUrl = baseUrl + 'api/tutor/student-aggregated-statistic-snapshot';
+        this.baseControllerUrl = `${baseUrl}api/tutor/student-aggregated-statistic-snapshot`;
     }
     get(studentId) {
         return this._httpClient.get(`${this.baseControllerUrl}/query/get-by-id/${studentId}`);
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: StudentAggregatedStatisticSnapshotService, deps: [{ token: i1.HttpClient }, { token: 'BASE_URL' }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: StudentAggregatedStatisticSnapshotService, providedIn: 'root' }); }
+    getDebugInfo(studentId) {
+        return this._httpClient.get(`${this.baseControllerUrl}/query/get-by-id/${studentId}/debug-info`);
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: StudentAggregatedStatisticSnapshotService, deps: [{ token: i1.HttpClient }, { token: 'BASE_URL' }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: StudentAggregatedStatisticSnapshotService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: StudentAggregatedStatisticSnapshotService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: StudentAggregatedStatisticSnapshotService, decorators: [{
             type: Injectable,
             args: [{ providedIn: 'root' }]
         }], ctorParameters: () => [{ type: i1.HttpClient }, { type: undefined, decorators: [{
@@ -1273,10 +1184,49 @@ class GroupStatisticSnapshotStudentService {
     get(model) {
         return this._httpClient.post(`${this.baseControllerUrl}/get`, model);
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: GroupStatisticSnapshotStudentService, deps: [{ token: i1.HttpClient }, { token: 'BASE_URL' }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: GroupStatisticSnapshotStudentService, providedIn: 'root' }); }
+    /**
+     * Получить информацию о снапшоте.
+     * @param id идентификатор снепшота
+     * @returns
+     */
+    getSnapshotInfo(id) {
+        return this._httpClient.get(`${this.baseControllerUrl}/snapshot-info/${id}`);
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: GroupStatisticSnapshotStudentService, deps: [{ token: i1.HttpClient }, { token: 'BASE_URL' }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: GroupStatisticSnapshotStudentService, providedIn: 'root' }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: GroupStatisticSnapshotStudentService, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root',
+                }]
+        }], ctorParameters: () => [{ type: i1.HttpClient }, { type: undefined, decorators: [{
+                    type: Inject,
+                    args: ['BASE_URL']
+                }] }] });
+
+/**
+ * Методы контроллера Tutor.Api.Controllers.Subjects.SubjectMenuController
+ *
+ * Базовый урл = api/tutor/subject/menu
+ *
+ * Методы для работы с меню предмета
+ */
+class SubjectMenuService {
+    constructor(_httpClient, baseUrl) {
+        this._httpClient = _httpClient;
+        this.baseControllerUrl = `${baseUrl}api/tutor/subject/menu`;
+    }
+    create(model) {
+        return this._httpClient.post(`${this.baseControllerUrl}/create`, model);
+    }
+    getMain() {
+        return this._httpClient.get(`${this.baseControllerUrl}/query/main`);
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: SubjectMenuService, deps: [{ token: i1.HttpClient }, { token: 'BASE_URL' }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: SubjectMenuService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: GroupStatisticSnapshotStudentService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: SubjectMenuService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
@@ -1286,6 +1236,13 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.13", ngImpo
                     args: ['BASE_URL']
                 }] }] });
 
+var StudentGroupType;
+(function (StudentGroupType) {
+    StudentGroupType["Course"] = "Course";
+    StudentGroupType["ClassRoom"] = "ClassRoom";
+    StudentGroupType["ExternalProduct"] = "ExternalProduct";
+})(StudentGroupType || (StudentGroupType = {}));
+
 var AnswerValidationResultType;
 (function (AnswerValidationResultType) {
     AnswerValidationResultType["NeedToCheckByYourSelf"] = "NeedToCheckByYourSelf";
@@ -1321,7 +1278,18 @@ var TestQuestionType;
     TestQuestionType["DetailedAnswer"] = "DetailedAnswer";
     TestQuestionType["TypeAnswerWithErrors"] = "TypeAnswerWithErrors";
     TestQuestionType["ManyAnswersBoxes"] = "ManyAnswersBoxes";
+    TestQuestionType["FillGaps"] = "FillGaps";
 })(TestQuestionType || (TestQuestionType = {}));
+var GapType;
+(function (GapType) {
+    GapType["Select"] = "Select";
+    GapType["Input"] = "Input";
+})(GapType || (GapType = {}));
+var SelectRightAnswerOrAnswersQuestionDataItemType;
+(function (SelectRightAnswerOrAnswersQuestionDataItemType) {
+    SelectRightAnswerOrAnswersQuestionDataItemType["FileId"] = "FileId";
+    SelectRightAnswerOrAnswersQuestionDataItemType["MarkUp"] = "MarkUp";
+})(SelectRightAnswerOrAnswersQuestionDataItemType || (SelectRightAnswerOrAnswersQuestionDataItemType = {}));
 
 var StudentCoursePaymentType;
 (function (StudentCoursePaymentType) {
@@ -1335,13 +1303,6 @@ var TestQuestionErrorsStatisticOrderType;
     TestQuestionErrorsStatisticOrderType["RecentErrors"] = "RecentErrors";
 })(TestQuestionErrorsStatisticOrderType || (TestQuestionErrorsStatisticOrderType = {}));
 
-var SubjectMenuItemType;
-(function (SubjectMenuItemType) {
-    SubjectMenuItemType["MenuItem"] = "MenuItem";
-    SubjectMenuItemType["WorkSpaceLink"] = "WorkSpaceLink";
-    SubjectMenuItemType["SubjectTestsLink"] = "SubjectTestsLink";
-})(SubjectMenuItemType || (SubjectMenuItemType = {}));
-
 /**
  * Роли для модуля Tutor
  */
@@ -1372,15 +1333,15 @@ class ImageSrcExtensions {
     /**
      * Вовзращает полный путь к изображению по идентификатору файла и типу размера изображения
      * @param publicImageUrlFormat Форматированная строка содержащая {fileId} и {sizeType} для замены
-     * @param imageId Идентификатор изображения
+     * @param imageFileId Идентификатор изображения
      * @param imageType Тип изображения
      * @returns
      */
-    static createImagePath(publicImageUrlFormat, imageId, imageType = 'Medium') {
-        if (imageId === null || imageId === undefined) {
+    static createImagePath(publicImageUrlFormat, imageFileId, sizeType = 'Medium') {
+        if (imageFileId === null || imageFileId === undefined) {
             return null;
         }
-        return publicImageUrlFormat.replace('{sizeType}', imageType).replace('{fileId}', imageId.toString());
+        return publicImageUrlFormat.replace('{sizeType}', sizeType).replace('{fileId}', imageFileId.toString());
     }
 }
 
@@ -1392,5 +1353,5 @@ class ImageSrcExtensions {
  * Generated bundle index. Do not edit.
  */
 
-export { AnswerValidationResultType, CourseDeadlineWarningService, CourseLandingPageQueryService, CourseOrderService, CoursePaymentQueryService, CoursePaymentService, CourseShopWindowDetailedService, CourseThemeItemTestRestrictionService, CourseThemeItemTestRestrictionStudentService, CourseThemeItemType, CuratorMessageTemplateService, DefaultCourseLandingPageQueryService, GroupStatisticSnapshotStudentService, ImageSrcExtensions, OpenApiQuestionLikeService, OpenApiTestSolutionService, PmtSystemService, QuestionLikeService, QuestionValidationSourceType, StudentAggregatedStatisticSnapshotService, StudentCoursePaymentType, StudentCourseProgressQueryService, StudentCourseProgressService, StudentCourseViewService, StudentGroupCourseAccessService, StudentGroupEnterService, StudentGroupInfoPageService, StudentGroupMaterialService, StudentGroupPaymentPlanQueryService, StudentGroupQueryService, StudentGroupTestRelationQueryService, StudentQueryService, StudentRegistrationService, StudentSubjectViewService, StudentTestSolutionQueryService, StudentTestSolutionService, StudentTestSolutionStartService, SubjectMenuItemType, SubjectMenuService, SubjectQueryService, SubjectsService, TestQuestionErrorsStatisticOrderType, TestQuestionStatisticQueryService, TestQuestionType, TestRestrictionValidationResultRuleType, TestSolutionDetailedQueryService, TestSolutionQueryService, TestSolutionResultService, TestsService, TutorAppConfigurationService, TutorCommonSettingsService, TutorLogicModule, TutorRoles };
+export { AnswerValidationResultType, CourseDeadlineWarningService, CourseLandingPageQueryService, CourseOrderService, CoursePaymentQueryService, CoursePaymentService, CourseShopWindowDetailedService, CourseThemeItemTestRestrictionService, CourseThemeItemTestRestrictionStudentService, CourseThemeItemType, CuratorMessageTemplateService, DefaultCourseLandingPageQueryService, GapType, GroupStatisticSnapshotStudentService, ImageSrcExtensions, OpenApiQuestionLikeService, OpenApiTestSolutionService, PmtSystemService, QuestionLikeService, QuestionValidationSourceType, SelectRightAnswerOrAnswersQuestionDataItemType, StudentAggregatedStatisticSnapshotService, StudentCoursePaymentType, StudentCourseProgressQueryService, StudentCourseProgressService, StudentCourseViewService, StudentGroupCourseAccessService, StudentGroupEnterService, StudentGroupInfoPageService, StudentGroupMaterialService, StudentGroupPaymentPlanQueryService, StudentGroupQueryService, StudentGroupTestRelationQueryService, StudentGroupType, StudentQueryService, StudentRegistrationService, StudentTestSolutionQueryService, StudentTestSolutionService, StudentTestSolutionStartService, SubjectMenuService, SubjectQueryService, SubjectsService, TestQuestionErrorsStatisticOrderType, TestQuestionStatisticQueryService, TestQuestionType, TestRestrictionValidationResultRuleType, TestSolutionDetailedQueryService, TestSolutionQueryService, TestSolutionResultService, TestsService, TutorAppConfigurationService, TutorLogicModule, TutorRoles };
 //# sourceMappingURL=tutor-logic.mjs.map