From 0969b5cff1a70e759ce1dd2a66c2315be7126582 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 15 Jun 2018 12:03:31 +0200
Subject: [PATCH] MOBILE-2428 aot: Fix AOT build in workshop and latest changes

---
 .../pages/password-modal/password-modal.module.ts      |  2 ++
 src/core/siteplugins/components/components.module.ts   | 10 +++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/addon/mod/lesson/pages/password-modal/password-modal.module.ts b/src/addon/mod/lesson/pages/password-modal/password-modal.module.ts
index 5aebe2d78..1df852d5c 100644
--- a/src/addon/mod/lesson/pages/password-modal/password-modal.module.ts
+++ b/src/addon/mod/lesson/pages/password-modal/password-modal.module.ts
@@ -17,6 +17,7 @@ import { IonicPageModule } from 'ionic-angular';
 import { AddonModLessonPasswordModalPage } from './password-modal';
 import { TranslateModule } from '@ngx-translate/core';
 import { CoreComponentsModule } from '@components/components.module';
+import { CoreDirectivesModule } from '@directives/directives.module';
 
 @NgModule({
     declarations: [
@@ -24,6 +25,7 @@ import { CoreComponentsModule } from '@components/components.module';
     ],
     imports: [
         CoreComponentsModule,
+        CoreDirectivesModule,
         IonicPageModule.forChild(AddonModLessonPasswordModalPage),
         TranslateModule.forChild()
     ]
diff --git a/src/core/siteplugins/components/components.module.ts b/src/core/siteplugins/components/components.module.ts
index a5e5b75a7..9619ee02e 100644
--- a/src/core/siteplugins/components/components.module.ts
+++ b/src/core/siteplugins/components/components.module.ts
@@ -28,6 +28,7 @@ import { CoreSitePluginsQuestionBehaviourComponent } from './question-behaviour/
 import { CoreSitePluginsQuizAccessRuleComponent } from './quiz-access-rule/quiz-access-rule';
 import { CoreSitePluginsAssignFeedbackComponent } from './assign-feedback/assign-feedback';
 import { CoreSitePluginsAssignSubmissionComponent } from './assign-submission/assign-submission';
+import { CoreSitePluginsWorkshopAssessmentStrategyComponent } from './workshop-assessment-strategy/workshop-assessment-strategy';
 
 @NgModule({
     declarations: [
@@ -40,7 +41,8 @@ import { CoreSitePluginsAssignSubmissionComponent } from './assign-submission/as
         CoreSitePluginsQuestionBehaviourComponent,
         CoreSitePluginsQuizAccessRuleComponent,
         CoreSitePluginsAssignFeedbackComponent,
-        CoreSitePluginsAssignSubmissionComponent
+        CoreSitePluginsAssignSubmissionComponent,
+        CoreSitePluginsWorkshopAssessmentStrategyComponent
     ],
     imports: [
         CommonModule,
@@ -61,7 +63,8 @@ import { CoreSitePluginsAssignSubmissionComponent } from './assign-submission/as
         CoreSitePluginsQuestionBehaviourComponent,
         CoreSitePluginsQuizAccessRuleComponent,
         CoreSitePluginsAssignFeedbackComponent,
-        CoreSitePluginsAssignSubmissionComponent
+        CoreSitePluginsAssignSubmissionComponent,
+        CoreSitePluginsWorkshopAssessmentStrategyComponent
     ],
     entryComponents: [
         CoreSitePluginsModuleIndexComponent,
@@ -72,7 +75,8 @@ import { CoreSitePluginsAssignSubmissionComponent } from './assign-submission/as
         CoreSitePluginsQuestionBehaviourComponent,
         CoreSitePluginsQuizAccessRuleComponent,
         CoreSitePluginsAssignFeedbackComponent,
-        CoreSitePluginsAssignSubmissionComponent
+        CoreSitePluginsAssignSubmissionComponent,
+        CoreSitePluginsWorkshopAssessmentStrategyComponent
     ]
 })
 export class CoreSitePluginsComponentsModule {}