raphael 3 years ago
parent
commit
bf98228d0e

+ 16
- 1
Entity/JupyterVirtualClassroom.php View File

@@ -34,7 +34,7 @@ implements ActivityInterface
34 34
 	/**
35 35
 	 * @param boolean
36 36
 	 */
37
-	private $isAssesment;
37
+	private $isAssesment = false;
38 38
 
39 39
 	private $classroomRegistration;
40 40
 	
@@ -210,4 +210,19 @@ implements ActivityInterface
210 210
 		]));
211 211
 	}
212 212
 
213
+    /**
214
+     * Set facultative
215
+     *
216
+     * @param  bool  $isOptional  Facultative
217
+     *
218
+     * @return  self
219
+     */ 
220
+    public function setIsOptional(bool $isOptional)
221
+    {
222
+        $this->isOptional = $isOptional;
223
+
224
+        return $this;
225
+	}
226
+	
227
+
213 228
 }

+ 2
- 2
Form/JupyterCreateType.php View File

@@ -21,11 +21,11 @@ class JupyterCreateType extends AbstractType
21 21
 			'required' => true,
22 22
 		));
23 23
 
24
-		$builder->add('isAssesment', SwitchType::class, array(
24
+		/*$builder->add('isAssesment', SwitchType::class, array(
25 25
 			'required' => false, 
26 26
 			'label_attr' => array('class' => 'checkbox-custom'),
27 27
 			'label' => 'Evaluation'
28
-		));
28
+		));*/
29 29
 	}
30 30
 
31 31
 	public function configureOptions(OptionsResolver $resolver)

+ 8
- 1
Form/JupyterUpdateType.php View File

@@ -40,10 +40,17 @@ class JupyterUpdateType extends SequenceItemUpdateType
40 40
 			'required' => false
41 41
 		));
42 42
 
43
-		$builder->add('isAssesment', SwitchType::class, array(
43
+		/*$builder->add('isAssesment', SwitchType::class, array(
44 44
 			'required' => false, 
45 45
 			'label_attr' => array('class' => 'checkbox-custom'),
46 46
 			'label' => 'Evaluation'
47
+		));*/
48
+
49
+		
50
+		$builder->add('isOptional', SwitchType::class, array(
51
+			'required' => false, 
52
+			'label_attr' => array('class' => 'checkbox-custom'),
53
+			'label' => 'form_label_sequence_item_isOptional'
47 54
 		));
48 55
 		
49 56
 		$builder->add('duration', DateIntervalType::class, array(

+ 8
- 1
Resources/config/doctrine/JupyterVirtualClassroom.orm.xml View File

@@ -22,11 +22,18 @@
22 22
 	</one-to-many>
23 23
 		
24 24
 
25
-	<field name="isAssesment" column="is_assesment" type="boolean" >
25
+	<field name="isAssesment" column="is_assesment" type="boolean" nullable="false">
26 26
 		<options>
27 27
             <option name="default">0</option>
28 28
         </options>
29 29
     </field>
30
+
31
+	<field name="isOptional" column="is_optional" type="boolean" nullable="false">
32
+		<options>
33
+			<option name="default">0</option>
34
+		</options>
35
+	</field>
36
+
30 37
 	<entity-listeners>
31 38
 		<entity-listener class="Logipro\Bundle\PhoenixJupyterBundle\EntityListener\JupyterVirtualClassroomListener" />
32 39
 	</entity-listeners>

Resources/public/bundles/logiprophoenixjupyter/Css/learning-space.2202a0da.js → Resources/public/bundles/logiprophoenixjupyter/Css/learning-space.3d871d5c.js View File


Resources/public/bundles/logiprophoenixjupyter/Css/test_css.ad8cdc01.js → Resources/public/bundles/logiprophoenixjupyter/Css/test_css.77733584.js View File


Resources/public/bundles/logiprophoenixjupyter/Css/variables.a740e820.js → Resources/public/bundles/logiprophoenixjupyter/Css/variables.a225cd8a.js View File


Resources/public/bundles/logiprophoenixjupyter/Js/back-office.d1bc8949.js → Resources/public/bundles/logiprophoenixjupyter/Js/back-office.1cee347c.js View File


Resources/public/bundles/logiprophoenixjupyter/Js/learning-space.6a3fd835.js → Resources/public/bundles/logiprophoenixjupyter/Js/learning-space.c31fdbd1.js View File


Resources/public/bundles/logiprophoenixjupyter/images/ico-reset.df79b391.svg → Resources/public/bundles/logiprophoenixjupyter/images/ico-reset.13dc9615.svg View File


Resources/public/bundles/logiprophoenixjupyter/images/icon-jupyter.fbb74265.svg → Resources/public/bundles/logiprophoenixjupyter/images/icon-jupyter.3e9f76c8.svg View File


Resources/public/bundles/logiprophoenixjupyter/images/icon-ls-jupyter.fbb74265.svg → Resources/public/bundles/logiprophoenixjupyter/images/icon-ls-jupyter.3e9f76c8.svg View File


+ 9
- 9
Resources/public/bundles/logiprophoenixjupyter/manifest.json View File

@@ -1,16 +1,16 @@
1 1
 {
2
-  "bundles/logiprophoenixjupyter/share.js": "/bundles/logiprophoenixjupyter/bundles/logiprophoenixjupyter/share.3313d26c.js",
3
-  "bundles/logiprophoenixjupyter/Js/learning-space.js": "/bundles/logiprophoenixjupyter/bundles/logiprophoenixjupyter/Js/learning-space.6a3fd835.js",
2
+  "bundles/logiprophoenixjupyter/share.js": "/bundles/logiprophoenixjupyter/bundles/logiprophoenixjupyter/share.edf0e6b6.js",
3
+  "bundles/logiprophoenixjupyter/Js/learning-space.js": "/bundles/logiprophoenixjupyter/bundles/logiprophoenixjupyter/Js/learning-space.c31fdbd1.js",
4 4
   "bundles/logiprophoenixjupyter/Js/learning-space-loader.js": "/bundles/logiprophoenixjupyter/bundles/logiprophoenixjupyter/Js/learning-space-loader.437b8cec.js",
5
-  "bundles/logiprophoenixjupyter/Js/back-office.js": "/bundles/logiprophoenixjupyter/bundles/logiprophoenixjupyter/Js/back-office.d1bc8949.js",
6
-  "bundles/logiprophoenixjupyter/Css/variables.js": "/bundles/logiprophoenixjupyter/bundles/logiprophoenixjupyter/Css/variables.a740e820.js",
5
+  "bundles/logiprophoenixjupyter/Js/back-office.js": "/bundles/logiprophoenixjupyter/bundles/logiprophoenixjupyter/Js/back-office.1cee347c.js",
6
+  "bundles/logiprophoenixjupyter/Css/variables.js": "/bundles/logiprophoenixjupyter/bundles/logiprophoenixjupyter/Css/variables.a225cd8a.js",
7 7
   "bundles/logiprophoenixjupyter/Css/variables.css": "/bundles/logiprophoenixjupyter/bundles/logiprophoenixjupyter/Css/variables.d41d8cd9.css",
8
-  "bundles/logiprophoenixjupyter/Css/test_css.js": "/bundles/logiprophoenixjupyter/bundles/logiprophoenixjupyter/Css/test_css.ad8cdc01.js",
8
+  "bundles/logiprophoenixjupyter/Css/test_css.js": "/bundles/logiprophoenixjupyter/bundles/logiprophoenixjupyter/Css/test_css.77733584.js",
9 9
   "bundles/logiprophoenixjupyter/Css/test_css.css": "/bundles/logiprophoenixjupyter/bundles/logiprophoenixjupyter/Css/test_css.20e6b139.css",
10
-  "bundles/logiprophoenixjupyter/Css/learning-space.js": "/bundles/logiprophoenixjupyter/bundles/logiprophoenixjupyter/Css/learning-space.2202a0da.js",
10
+  "bundles/logiprophoenixjupyter/Css/learning-space.js": "/bundles/logiprophoenixjupyter/bundles/logiprophoenixjupyter/Css/learning-space.3d871d5c.js",
11 11
   "bundles/logiprophoenixjupyter/Css/learning-space.css": "/bundles/logiprophoenixjupyter/bundles/logiprophoenixjupyter/Css/learning-space.569b0c03.css",
12 12
   "bundles/logiprophoenixjupyter/manifest.js": "/bundles/logiprophoenixjupyter/bundles/logiprophoenixjupyter/manifest.d41d8cd9.js",
13
-  "bundles/logiprophoenixjupyter/images/icon-jupyter.svg": "/bundles/logiprophoenixjupyter/bundles/logiprophoenixjupyter/images/icon-jupyter.fbb74265.svg",
14
-  "bundles/logiprophoenixjupyter/images/icon-ls-jupyter.svg": "/bundles/logiprophoenixjupyter/bundles/logiprophoenixjupyter/images/icon-ls-jupyter.fbb74265.svg",
15
-  "bundles/logiprophoenixjupyter/images/ico-reset.svg": "/bundles/logiprophoenixjupyter/bundles/logiprophoenixjupyter/images/ico-reset.df79b391.svg"
13
+  "bundles/logiprophoenixjupyter/images/icon-jupyter.svg": "/bundles/logiprophoenixjupyter/bundles/logiprophoenixjupyter/images/icon-jupyter.3e9f76c8.svg",
14
+  "bundles/logiprophoenixjupyter/images/icon-ls-jupyter.svg": "/bundles/logiprophoenixjupyter/bundles/logiprophoenixjupyter/images/icon-ls-jupyter.3e9f76c8.svg",
15
+  "bundles/logiprophoenixjupyter/images/ico-reset.svg": "/bundles/logiprophoenixjupyter/bundles/logiprophoenixjupyter/images/ico-reset.13dc9615.svg"
16 16
 }

+ 0
- 1
Resources/public/bundles/logiprophoenixjupyter/share.3313d26c.js View File

@@ -1 +0,0 @@
1
-webpackJsonp([0],{"/KNC":function(o,e){o.exports="/bundles/logiprophoenixjupyter/bundles/logiprophoenixjupyter/images/icon-jupyter.fbb74265.svg"},0:function(o,e,p){o.exports=p("JNT0")},JNT0:function(o,e,p){p("/KNC"),p("qoeG"),p("JYw+")},"JYw+":function(o,e){o.exports="/bundles/logiprophoenixjupyter/bundles/logiprophoenixjupyter/images/ico-reset.df79b391.svg"},qoeG:function(o,e){o.exports="/bundles/logiprophoenixjupyter/bundles/logiprophoenixjupyter/images/icon-ls-jupyter.fbb74265.svg"}},[0]);

+ 1
- 0
Resources/public/bundles/logiprophoenixjupyter/share.edf0e6b6.js View File

@@ -0,0 +1 @@
1
+webpackJsonp([0],{"/KNC":function(e,o){e.exports="/bundles/logiprophoenixjupyter/bundles/logiprophoenixjupyter/images/icon-jupyter.3e9f76c8.svg"},0:function(e,o,p){e.exports=p("JNT0")},JNT0:function(e,o,p){p("/KNC"),p("qoeG"),p("JYw+")},"JYw+":function(e,o){e.exports="/bundles/logiprophoenixjupyter/bundles/logiprophoenixjupyter/images/ico-reset.13dc9615.svg"},qoeG:function(e,o){e.exports="/bundles/logiprophoenixjupyter/bundles/logiprophoenixjupyter/images/icon-ls-jupyter.3e9f76c8.svg"}},[0]);

+ 3
- 1
Resources/views/back-office/formCreate.html.twig View File

@@ -5,9 +5,11 @@
5 5
             <label for="jupyter_create_title" class="required">Titre</label>
6 6
             {{ form_widget(form.title)}}
7 7
         </div>
8
+<!--
8 9
         <div class="form-group">
9
-            {{ form_row(form.isAssesment) }}
10
+            {# form_row(form.isAssesment) #}
10 11
         </div>
12
+        -->
11 13
     </fieldset>
12 14
 </div>
13 15
 

+ 2
- 2
Resources/views/back-office/formUpdate.html.twig View File

@@ -15,8 +15,8 @@
15 15
             {{ form_widget(form.title)}}
16 16
         </div>
17 17
         <div class="form-group">
18
-            
19
-            {{ form_row(form.isAssesment) }}
18
+            {{ form_row(form.isOptional) }}
19
+            {# form_row(form.isAssesment) #}
20 20
         </div>
21 21
     </fieldset>
22 22
 

Loading…
Cancel
Save