diff --git a/src/ninesurvey-1.0/config/routes.yaml b/src/ninesurvey-1.0/config/routes.yaml index f0c6434..b320d6d 100644 --- a/src/ninesurvey-1.0/config/routes.yaml +++ b/src/ninesurvey-1.0/config/routes.yaml @@ -259,5 +259,5 @@ app_quest_byloginkey: defaults: { _controller: App\Controller\QuestController:byloginkey } app_quest_pdf: - path: /pdf/{id} + path: /user/pdf/{id} defaults: { _controller: App\Controller\QuestController:result } \ No newline at end of file diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/balloonpanel/skins/moono-lisa/images/close.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/balloonpanel/skins/moono-lisa/images/close.png index 40caa6d..91c2218 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/balloonpanel/skins/moono-lisa/images/close.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/balloonpanel/skins/moono-lisa/images/close.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/balloonpanel/skins/moono-lisa/images/hidpi/close.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/balloonpanel/skins/moono-lisa/images/hidpi/close.png index 0e4aa2e..b52132d 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/balloonpanel/skins/moono-lisa/images/hidpi/close.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/balloonpanel/skins/moono-lisa/images/hidpi/close.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/balloonpanel/skins/moono/images/close.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/balloonpanel/skins/moono/images/close.png index 04b9c97..7ad46b8 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/balloonpanel/skins/moono/images/close.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/balloonpanel/skins/moono/images/close.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/bidi/icons/bidiltr.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/bidi/icons/bidiltr.png index 310e53c..f6cf57a 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/bidi/icons/bidiltr.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/bidi/icons/bidiltr.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/bidi/icons/bidirtl.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/bidi/icons/bidirtl.png index 1fcff90..0eeff4c 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/bidi/icons/bidirtl.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/bidi/icons/bidirtl.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/bidi/icons/hidpi/bidiltr.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/bidi/icons/hidpi/bidiltr.png index f657d52..a388090 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/bidi/icons/hidpi/bidiltr.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/bidi/icons/hidpi/bidiltr.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/bidi/icons/hidpi/bidirtl.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/bidi/icons/hidpi/bidirtl.png index ba1ba35..e6b62d3 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/bidi/icons/hidpi/bidirtl.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/bidi/icons/hidpi/bidirtl.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/codesnippet/icons/codesnippet.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/codesnippet/icons/codesnippet.png index c718510..5d716ad 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/codesnippet/icons/codesnippet.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/codesnippet/icons/codesnippet.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/codesnippet/icons/hidpi/codesnippet.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/codesnippet/icons/hidpi/codesnippet.png index 2de477f..1def732 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/codesnippet/icons/hidpi/codesnippet.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/codesnippet/icons/hidpi/codesnippet.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/colorbutton/icons/bgcolor.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/colorbutton/icons/bgcolor.png index aa03f44..73e18a1 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/colorbutton/icons/bgcolor.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/colorbutton/icons/bgcolor.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/colorbutton/icons/hidpi/bgcolor.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/colorbutton/icons/hidpi/bgcolor.png index 9e52d1e..b8d9130 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/colorbutton/icons/hidpi/bgcolor.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/colorbutton/icons/hidpi/bgcolor.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/colorbutton/icons/hidpi/textcolor.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/colorbutton/icons/hidpi/textcolor.png index 67faa8e..80d1cfe 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/colorbutton/icons/hidpi/textcolor.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/colorbutton/icons/hidpi/textcolor.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/colorbutton/icons/textcolor.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/colorbutton/icons/textcolor.png index 88575c1..27deb58 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/colorbutton/icons/textcolor.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/colorbutton/icons/textcolor.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/copyformatting/icons/copyformatting.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/copyformatting/icons/copyformatting.png index 1128408..3e2586a 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/copyformatting/icons/copyformatting.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/copyformatting/icons/copyformatting.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/copyformatting/icons/hidpi/copyformatting.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/copyformatting/icons/hidpi/copyformatting.png index c46e514..cc8e4b5 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/copyformatting/icons/hidpi/copyformatting.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/copyformatting/icons/hidpi/copyformatting.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/div/icons/creatediv.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/div/icons/creatediv.png index 5c70a49..562efb0 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/div/icons/creatediv.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/div/icons/creatediv.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/div/icons/hidpi/creatediv.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/div/icons/hidpi/creatediv.png index eb63fe3..3dc7eb6 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/div/icons/hidpi/creatediv.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/div/icons/hidpi/creatediv.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/docprops/icons/docprops-rtl.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/docprops/icons/docprops-rtl.png index c6c6353..3317caa 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/docprops/icons/docprops-rtl.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/docprops/icons/docprops-rtl.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/docprops/icons/docprops.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/docprops/icons/docprops.png index 16a5000..d4030e7 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/docprops/icons/docprops.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/docprops/icons/docprops.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/docprops/icons/hidpi/docprops-rtl.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/docprops/icons/hidpi/docprops-rtl.png index 3e468bd..60acc41 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/docprops/icons/hidpi/docprops-rtl.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/docprops/icons/hidpi/docprops-rtl.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/docprops/icons/hidpi/docprops.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/docprops/icons/hidpi/docprops.png index ac44303..71a960b 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/docprops/icons/hidpi/docprops.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/docprops/icons/hidpi/docprops.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/easyimage/icons/easyimageupload.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/easyimage/icons/easyimageupload.png index 8ea9725..d439d24 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/easyimage/icons/easyimageupload.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/easyimage/icons/easyimageupload.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/easyimage/icons/hidpi/easyimageupload.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/easyimage/icons/hidpi/easyimageupload.png index d0f21ae..3d6218b 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/easyimage/icons/hidpi/easyimageupload.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/easyimage/icons/hidpi/easyimageupload.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/find/icons/find-rtl.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/find/icons/find-rtl.png index 0fa6744..3714e97 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/find/icons/find-rtl.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/find/icons/find-rtl.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/find/icons/find.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/find/icons/find.png index 0fa6744..3714e97 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/find/icons/find.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/find/icons/find.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/find/icons/hidpi/find-rtl.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/find/icons/hidpi/find-rtl.png index 96e954e..786a6e8 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/find/icons/hidpi/find-rtl.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/find/icons/hidpi/find-rtl.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/find/icons/hidpi/find.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/find/icons/hidpi/find.png index 96e954e..786a6e8 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/find/icons/hidpi/find.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/find/icons/hidpi/find.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/find/icons/hidpi/replace.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/find/icons/hidpi/replace.png index bd8f6ad..559e275 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/find/icons/hidpi/replace.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/find/icons/hidpi/replace.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/find/icons/replace.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/find/icons/replace.png index db16ea4..47c2b8c 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/find/icons/replace.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/find/icons/replace.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/flash/icons/flash.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/flash/icons/flash.png index 983cc8e..5f57329 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/flash/icons/flash.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/flash/icons/flash.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/flash/icons/hidpi/flash.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/flash/icons/hidpi/flash.png index 986b864..3045d50 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/flash/icons/hidpi/flash.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/flash/icons/hidpi/flash.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/forms/icons/button.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/forms/icons/button.png index ec9bf1b..0190499 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/forms/icons/button.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/forms/icons/button.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/forms/icons/checkbox.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/forms/icons/checkbox.png index 868626d..0831ecf 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/forms/icons/checkbox.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/forms/icons/checkbox.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/forms/icons/form.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/forms/icons/form.png index e171557..c7bb836 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/forms/icons/form.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/forms/icons/form.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/forms/icons/hiddenfield.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/forms/icons/hiddenfield.png index 060dfa7..7555e57 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/forms/icons/hiddenfield.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/forms/icons/hiddenfield.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/forms/icons/hidpi/button.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/forms/icons/hidpi/button.png index 15a9c92..7f10882 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/forms/icons/hidpi/button.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/forms/icons/hidpi/button.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/forms/icons/hidpi/checkbox.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/forms/icons/hidpi/checkbox.png index af19fe3..e439b01 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/forms/icons/hidpi/checkbox.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/forms/icons/hidpi/checkbox.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/forms/icons/hidpi/form.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/forms/icons/hidpi/form.png index 7953e8f..0063152 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/forms/icons/hidpi/form.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/forms/icons/hidpi/form.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/forms/icons/hidpi/hiddenfield.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/forms/icons/hidpi/hiddenfield.png index 1413b11..83881ae 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/forms/icons/hidpi/hiddenfield.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/forms/icons/hidpi/hiddenfield.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/forms/icons/hidpi/imagebutton.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/forms/icons/hidpi/imagebutton.png index 5a5e325..eaa55d9 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/forms/icons/hidpi/imagebutton.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/forms/icons/hidpi/imagebutton.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/forms/icons/hidpi/radio.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/forms/icons/hidpi/radio.png index 894f15a..e8b5df6 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/forms/icons/hidpi/radio.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/forms/icons/hidpi/radio.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/forms/icons/hidpi/select-rtl.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/forms/icons/hidpi/select-rtl.png index cf5a0da..61f75c0 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/forms/icons/hidpi/select-rtl.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/forms/icons/hidpi/select-rtl.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/forms/icons/hidpi/select.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/forms/icons/hidpi/select.png index bfc23b2..423dedc 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/forms/icons/hidpi/select.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/forms/icons/hidpi/select.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/forms/icons/hidpi/textarea-rtl.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/forms/icons/hidpi/textarea-rtl.png index e568912..dd5b2ef 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/forms/icons/hidpi/textarea-rtl.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/forms/icons/hidpi/textarea-rtl.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/forms/icons/hidpi/textarea.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/forms/icons/hidpi/textarea.png index 3e9e891..9929e11 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/forms/icons/hidpi/textarea.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/forms/icons/hidpi/textarea.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/forms/icons/hidpi/textfield-rtl.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/forms/icons/hidpi/textfield-rtl.png index c39a054..8457468 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/forms/icons/hidpi/textfield-rtl.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/forms/icons/hidpi/textfield-rtl.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/forms/icons/hidpi/textfield.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/forms/icons/hidpi/textfield.png index c39a054..8457468 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/forms/icons/hidpi/textfield.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/forms/icons/hidpi/textfield.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/forms/icons/imagebutton.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/forms/icons/imagebutton.png index ab768c1..a394a68 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/forms/icons/imagebutton.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/forms/icons/imagebutton.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/forms/icons/radio.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/forms/icons/radio.png index 08b9462..92080a6 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/forms/icons/radio.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/forms/icons/radio.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/forms/icons/select-rtl.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/forms/icons/select-rtl.png index 478144f..3db296e 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/forms/icons/select-rtl.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/forms/icons/select-rtl.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/forms/icons/select.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/forms/icons/select.png index 2906e55..94e6268 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/forms/icons/select.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/forms/icons/select.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/forms/icons/textarea-rtl.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/forms/icons/textarea-rtl.png index a23e17e..ad4be81 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/forms/icons/textarea-rtl.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/forms/icons/textarea-rtl.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/forms/icons/textarea.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/forms/icons/textarea.png index 91f6c23..a44db44 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/forms/icons/textarea.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/forms/icons/textarea.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/forms/icons/textfield-rtl.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/forms/icons/textfield-rtl.png index 123948a..583a531 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/forms/icons/textfield-rtl.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/forms/icons/textfield-rtl.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/forms/icons/textfield.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/forms/icons/textfield.png index 123948a..583a531 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/forms/icons/textfield.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/forms/icons/textfield.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/iframe/icons/hidpi/iframe.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/iframe/icons/hidpi/iframe.png index d99d0f3..8ac8ad4 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/iframe/icons/hidpi/iframe.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/iframe/icons/hidpi/iframe.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/iframe/icons/iframe.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/iframe/icons/iframe.png index a2f5545..c1fc663 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/iframe/icons/iframe.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/iframe/icons/iframe.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/image/images/noimage.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/image/images/noimage.png index 74c6ee9..6ab8af6 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/image/images/noimage.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/image/images/noimage.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/image2/icons/hidpi/image.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/image2/icons/hidpi/image.png index d0f21ae..3d6218b 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/image2/icons/hidpi/image.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/image2/icons/hidpi/image.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/image2/icons/image.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/image2/icons/image.png index 8ea9725..d439d24 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/image2/icons/image.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/image2/icons/image.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/justify/icons/hidpi/justifyblock.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/justify/icons/hidpi/justifyblock.png index 5c0cf43..9593d71 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/justify/icons/hidpi/justifyblock.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/justify/icons/hidpi/justifyblock.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/justify/icons/hidpi/justifycenter.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/justify/icons/hidpi/justifycenter.png index fd751be..035ded6 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/justify/icons/hidpi/justifycenter.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/justify/icons/hidpi/justifycenter.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/justify/icons/hidpi/justifyleft.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/justify/icons/hidpi/justifyleft.png index a109ad3..3309d58 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/justify/icons/hidpi/justifyleft.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/justify/icons/hidpi/justifyleft.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/justify/icons/hidpi/justifyright.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/justify/icons/hidpi/justifyright.png index 5125d56..6cc6c2f 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/justify/icons/hidpi/justifyright.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/justify/icons/hidpi/justifyright.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/justify/icons/justifyblock.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/justify/icons/justifyblock.png index ffe0620..26b0736 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/justify/icons/justifyblock.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/justify/icons/justifyblock.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/justify/icons/justifycenter.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/justify/icons/justifycenter.png index 8b5b40f..3d7c31d 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/justify/icons/justifycenter.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/justify/icons/justifycenter.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/justify/icons/justifyleft.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/justify/icons/justifyleft.png index a60d079..c7f78be 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/justify/icons/justifyleft.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/justify/icons/justifyleft.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/justify/icons/justifyright.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/justify/icons/justifyright.png index 21de814..904da1a 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/justify/icons/justifyright.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/justify/icons/justifyright.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/language/icons/hidpi/language.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/language/icons/hidpi/language.png index 7159a1f..c717142 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/language/icons/hidpi/language.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/language/icons/hidpi/language.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/language/icons/language.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/language/icons/language.png index 145af2f..a83af83 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/language/icons/language.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/language/icons/language.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/link/images/anchor.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/link/images/anchor.png index d94adb4..19a6234 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/link/images/anchor.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/link/images/anchor.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/link/images/hidpi/anchor.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/link/images/hidpi/anchor.png index 186c3e9..4dcf747 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/link/images/hidpi/anchor.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/link/images/hidpi/anchor.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/newpage/icons/hidpi/newpage-rtl.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/newpage/icons/hidpi/newpage-rtl.png index 9624cb6..81123f6 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/newpage/icons/hidpi/newpage-rtl.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/newpage/icons/hidpi/newpage-rtl.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/newpage/icons/hidpi/newpage.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/newpage/icons/hidpi/newpage.png index 8533ba9..ba8b3a8 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/newpage/icons/hidpi/newpage.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/newpage/icons/hidpi/newpage.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/newpage/icons/newpage-rtl.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/newpage/icons/newpage-rtl.png index c791c6e..5509291 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/newpage/icons/newpage-rtl.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/newpage/icons/newpage-rtl.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/newpage/icons/newpage.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/newpage/icons/newpage.png index f176ddb..36f7676 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/newpage/icons/newpage.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/newpage/icons/newpage.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/pagebreak/icons/hidpi/pagebreak-rtl.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/pagebreak/icons/hidpi/pagebreak-rtl.png index 70ec9f8..5ba207a 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/pagebreak/icons/hidpi/pagebreak-rtl.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/pagebreak/icons/hidpi/pagebreak-rtl.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/pagebreak/icons/hidpi/pagebreak.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/pagebreak/icons/hidpi/pagebreak.png index 5af52d5..4215cd4 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/pagebreak/icons/hidpi/pagebreak.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/pagebreak/icons/hidpi/pagebreak.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/pagebreak/icons/pagebreak-rtl.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/pagebreak/icons/pagebreak-rtl.png index 35bea0e..3587651 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/pagebreak/icons/pagebreak-rtl.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/pagebreak/icons/pagebreak-rtl.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/pagebreak/icons/pagebreak.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/pagebreak/icons/pagebreak.png index cf075ad..bc67ec3 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/pagebreak/icons/pagebreak.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/pagebreak/icons/pagebreak.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/placeholder/icons/hidpi/placeholder.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/placeholder/icons/hidpi/placeholder.png index 25d2361..e67a26b 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/placeholder/icons/hidpi/placeholder.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/placeholder/icons/hidpi/placeholder.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/placeholder/icons/placeholder.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/placeholder/icons/placeholder.png index 8d5b819..a41bfa5 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/placeholder/icons/placeholder.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/placeholder/icons/placeholder.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/preview/icons/hidpi/preview-rtl.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/preview/icons/hidpi/preview-rtl.png index 530fee0..725e323 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/preview/icons/hidpi/preview-rtl.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/preview/icons/hidpi/preview-rtl.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/preview/icons/hidpi/preview.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/preview/icons/hidpi/preview.png index e9629b3..dd117d9 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/preview/icons/hidpi/preview.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/preview/icons/hidpi/preview.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/preview/icons/preview-rtl.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/preview/icons/preview-rtl.png index fa568d4..2ffa765 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/preview/icons/preview-rtl.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/preview/icons/preview-rtl.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/preview/icons/preview.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/preview/icons/preview.png index 4111cc1..143c85b 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/preview/icons/preview.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/preview/icons/preview.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/print/icons/hidpi/print.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/print/icons/hidpi/print.png index 6b62afd..9dedd01 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/print/icons/hidpi/print.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/print/icons/hidpi/print.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/print/icons/print.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/print/icons/print.png index 598e4d1..5ab7747 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/print/icons/print.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/print/icons/print.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/save/icons/hidpi/save.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/save/icons/hidpi/save.png index e64ea05..9196b8f 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/save/icons/hidpi/save.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/save/icons/hidpi/save.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/save/icons/save.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/save/icons/save.png index d79fa58..c8e8f55 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/save/icons/save.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/save/icons/save.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/selectall/icons/hidpi/selectall.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/selectall/icons/hidpi/selectall.png index ef9c67b..67d7709 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/selectall/icons/hidpi/selectall.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/selectall/icons/hidpi/selectall.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/selectall/icons/selectall.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/selectall/icons/selectall.png index 1b9a4a9..e402aa1 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/selectall/icons/selectall.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/selectall/icons/selectall.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/showblocks/icons/hidpi/showblocks-rtl.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/showblocks/icons/hidpi/showblocks-rtl.png index 21fd33f..0a541e0 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/showblocks/icons/hidpi/showblocks-rtl.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/showblocks/icons/hidpi/showblocks-rtl.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/showblocks/icons/hidpi/showblocks.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/showblocks/icons/hidpi/showblocks.png index 94a8a39..bbc4a36 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/showblocks/icons/hidpi/showblocks.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/showblocks/icons/hidpi/showblocks.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/showblocks/icons/showblocks-rtl.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/showblocks/icons/showblocks-rtl.png index 75bfd37..3d47fae 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/showblocks/icons/showblocks-rtl.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/showblocks/icons/showblocks-rtl.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/showblocks/icons/showblocks.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/showblocks/icons/showblocks.png index 09fe2c7..d12ecef 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/showblocks/icons/showblocks.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/showblocks/icons/showblocks.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/smiley/icons/hidpi/smiley.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/smiley/icons/hidpi/smiley.png index 810d702..3864bd8 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/smiley/icons/hidpi/smiley.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/smiley/icons/hidpi/smiley.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/smiley/icons/smiley.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/smiley/icons/smiley.png index d351ba4..7f5baa8 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/smiley/icons/smiley.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/smiley/icons/smiley.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/sourcedialog/icons/hidpi/sourcedialog-rtl.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/sourcedialog/icons/hidpi/sourcedialog-rtl.png index c95da32..55aa57f 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/sourcedialog/icons/hidpi/sourcedialog-rtl.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/sourcedialog/icons/hidpi/sourcedialog-rtl.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/sourcedialog/icons/hidpi/sourcedialog.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/sourcedialog/icons/hidpi/sourcedialog.png index 2f3eae1..409a005 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/sourcedialog/icons/hidpi/sourcedialog.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/sourcedialog/icons/hidpi/sourcedialog.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/sourcedialog/icons/sourcedialog-rtl.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/sourcedialog/icons/sourcedialog-rtl.png index 5353eee..cb312ac 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/sourcedialog/icons/sourcedialog-rtl.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/sourcedialog/icons/sourcedialog-rtl.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/sourcedialog/icons/sourcedialog.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/sourcedialog/icons/sourcedialog.png index 0783e85..9256e1b 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/sourcedialog/icons/sourcedialog.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/sourcedialog/icons/sourcedialog.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/templates/icons/hidpi/templates-rtl.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/templates/icons/hidpi/templates-rtl.png index 9483ceb..0fa8195 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/templates/icons/hidpi/templates-rtl.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/templates/icons/hidpi/templates-rtl.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/templates/icons/hidpi/templates.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/templates/icons/hidpi/templates.png index 9483ceb..0fa8195 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/templates/icons/hidpi/templates.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/templates/icons/hidpi/templates.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/templates/icons/templates-rtl.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/templates/icons/templates-rtl.png index bca7714..545514c 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/templates/icons/templates-rtl.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/templates/icons/templates-rtl.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/templates/icons/templates.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/templates/icons/templates.png index bca7714..545514c 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/templates/icons/templates.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/templates/icons/templates.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/uicolor/icons/hidpi/uicolor.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/uicolor/icons/hidpi/uicolor.png index 9caa62b..1a7c606 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/uicolor/icons/hidpi/uicolor.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/uicolor/icons/hidpi/uicolor.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/plugins/uicolor/icons/uicolor.png b/src/ninesurvey-1.0/public/build/ckeditor/plugins/uicolor/icons/uicolor.png index f2f1de9..8b7cd64 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/plugins/uicolor/icons/uicolor.png and b/src/ninesurvey-1.0/public/build/ckeditor/plugins/uicolor/icons/uicolor.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/skins/moono-lisa/images/close.png b/src/ninesurvey-1.0/public/build/ckeditor/skins/moono-lisa/images/close.png index 40caa6d..91c2218 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/skins/moono-lisa/images/close.png and b/src/ninesurvey-1.0/public/build/ckeditor/skins/moono-lisa/images/close.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/skins/moono-lisa/images/hidpi/close.png b/src/ninesurvey-1.0/public/build/ckeditor/skins/moono-lisa/images/hidpi/close.png index fa00f4f..ccf324d 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/skins/moono-lisa/images/hidpi/close.png and b/src/ninesurvey-1.0/public/build/ckeditor/skins/moono-lisa/images/hidpi/close.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/skins/moono-lisa/images/hidpi/lock-open.png b/src/ninesurvey-1.0/public/build/ckeditor/skins/moono-lisa/images/hidpi/lock-open.png index c899789..ed5df80 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/skins/moono-lisa/images/hidpi/lock-open.png and b/src/ninesurvey-1.0/public/build/ckeditor/skins/moono-lisa/images/hidpi/lock-open.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/skins/moono-lisa/images/hidpi/lock.png b/src/ninesurvey-1.0/public/build/ckeditor/skins/moono-lisa/images/hidpi/lock.png index 25ad0f4..5ad40b1 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/skins/moono-lisa/images/hidpi/lock.png and b/src/ninesurvey-1.0/public/build/ckeditor/skins/moono-lisa/images/hidpi/lock.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/skins/moono-lisa/images/hidpi/refresh.png b/src/ninesurvey-1.0/public/build/ckeditor/skins/moono-lisa/images/hidpi/refresh.png index 117a2d4..bf0892e 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/skins/moono-lisa/images/hidpi/refresh.png and b/src/ninesurvey-1.0/public/build/ckeditor/skins/moono-lisa/images/hidpi/refresh.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/skins/moono-lisa/images/lock-open.png b/src/ninesurvey-1.0/public/build/ckeditor/skins/moono-lisa/images/lock-open.png index 42df5f4..a6e87db 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/skins/moono-lisa/images/lock-open.png and b/src/ninesurvey-1.0/public/build/ckeditor/skins/moono-lisa/images/lock-open.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/skins/moono-lisa/images/lock.png b/src/ninesurvey-1.0/public/build/ckeditor/skins/moono-lisa/images/lock.png index bde6772..43e4ffa 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/skins/moono-lisa/images/lock.png and b/src/ninesurvey-1.0/public/build/ckeditor/skins/moono-lisa/images/lock.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/skins/moono-lisa/images/refresh.png b/src/ninesurvey-1.0/public/build/ckeditor/skins/moono-lisa/images/refresh.png index e363764..39f2a12 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/skins/moono-lisa/images/refresh.png and b/src/ninesurvey-1.0/public/build/ckeditor/skins/moono-lisa/images/refresh.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/skins/moono/images/anchor.png b/src/ninesurvey-1.0/public/build/ckeditor/skins/moono/images/anchor.png index 1c802f5..1271ccf 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/skins/moono/images/anchor.png and b/src/ninesurvey-1.0/public/build/ckeditor/skins/moono/images/anchor.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/skins/moono/images/close.png b/src/ninesurvey-1.0/public/build/ckeditor/skins/moono/images/close.png index 2d02977..eec3bc1 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/skins/moono/images/close.png and b/src/ninesurvey-1.0/public/build/ckeditor/skins/moono/images/close.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/skins/moono/images/hidpi/anchor.png b/src/ninesurvey-1.0/public/build/ckeditor/skins/moono/images/hidpi/anchor.png index 17cca97..9857fe5 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/skins/moono/images/hidpi/anchor.png and b/src/ninesurvey-1.0/public/build/ckeditor/skins/moono/images/hidpi/anchor.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/skins/moono/images/hidpi/close.png b/src/ninesurvey-1.0/public/build/ckeditor/skins/moono/images/hidpi/close.png index de4eedf..93a52d8 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/skins/moono/images/hidpi/close.png and b/src/ninesurvey-1.0/public/build/ckeditor/skins/moono/images/hidpi/close.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/skins/moono/images/hidpi/lock-open.png b/src/ninesurvey-1.0/public/build/ckeditor/skins/moono/images/hidpi/lock-open.png index 594f0d3..8c6b642 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/skins/moono/images/hidpi/lock-open.png and b/src/ninesurvey-1.0/public/build/ckeditor/skins/moono/images/hidpi/lock-open.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/skins/moono/images/hidpi/lock.png b/src/ninesurvey-1.0/public/build/ckeditor/skins/moono/images/hidpi/lock.png index 1e23a0b..2f66e4d 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/skins/moono/images/hidpi/lock.png and b/src/ninesurvey-1.0/public/build/ckeditor/skins/moono/images/hidpi/lock.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/skins/moono/images/hidpi/refresh.png b/src/ninesurvey-1.0/public/build/ckeditor/skins/moono/images/hidpi/refresh.png index 42d94a9..2965cba 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/skins/moono/images/hidpi/refresh.png and b/src/ninesurvey-1.0/public/build/ckeditor/skins/moono/images/hidpi/refresh.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/skins/moono/images/lock-open.png b/src/ninesurvey-1.0/public/build/ckeditor/skins/moono/images/lock-open.png index 7d24c5f..20e87c9 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/skins/moono/images/lock-open.png and b/src/ninesurvey-1.0/public/build/ckeditor/skins/moono/images/lock-open.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/skins/moono/images/lock.png b/src/ninesurvey-1.0/public/build/ckeditor/skins/moono/images/lock.png index 8baeaa4..f2910a5 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/skins/moono/images/lock.png and b/src/ninesurvey-1.0/public/build/ckeditor/skins/moono/images/lock.png differ diff --git a/src/ninesurvey-1.0/public/build/ckeditor/skins/moono/images/refresh.png b/src/ninesurvey-1.0/public/build/ckeditor/skins/moono/images/refresh.png index d8106b0..020f277 100644 Binary files a/src/ninesurvey-1.0/public/build/ckeditor/skins/moono/images/refresh.png and b/src/ninesurvey-1.0/public/build/ckeditor/skins/moono/images/refresh.png differ diff --git a/src/ninesurvey-1.0/public/themes/look.png b/src/ninesurvey-1.0/public/themes/look.png index 6d82761..947a656 100644 Binary files a/src/ninesurvey-1.0/public/themes/look.png and b/src/ninesurvey-1.0/public/themes/look.png differ diff --git a/src/ninesurvey-1.0/public/themes/nineblue/look.png b/src/ninesurvey-1.0/public/themes/nineblue/look.png index de2c7d0..e506cb3 100644 Binary files a/src/ninesurvey-1.0/public/themes/nineblue/look.png and b/src/ninesurvey-1.0/public/themes/nineblue/look.png differ diff --git a/src/ninesurvey-1.0/public/themes/ninedark/look.png b/src/ninesurvey-1.0/public/themes/ninedark/look.png index 51a68cf..498913d 100644 Binary files a/src/ninesurvey-1.0/public/themes/ninedark/look.png and b/src/ninesurvey-1.0/public/themes/ninedark/look.png differ diff --git a/src/ninesurvey-1.0/public/themes/ninegray/look.png b/src/ninesurvey-1.0/public/themes/ninegray/look.png index 4c04680..e85d336 100644 Binary files a/src/ninesurvey-1.0/public/themes/ninegray/look.png and b/src/ninesurvey-1.0/public/themes/ninegray/look.png differ diff --git a/src/ninesurvey-1.0/public/themes/ninegreen/look.png b/src/ninesurvey-1.0/public/themes/ninegreen/look.png index b38f733..dcc2cd9 100644 Binary files a/src/ninesurvey-1.0/public/themes/ninegreen/look.png and b/src/ninesurvey-1.0/public/themes/ninegreen/look.png differ diff --git a/src/ninesurvey-1.0/public/themes/nineorange/look.png b/src/ninesurvey-1.0/public/themes/nineorange/look.png index b24f38d..3dd78fb 100644 Binary files a/src/ninesurvey-1.0/public/themes/nineorange/look.png and b/src/ninesurvey-1.0/public/themes/nineorange/look.png differ diff --git a/src/ninesurvey-1.0/public/themes/ninered/look.png b/src/ninesurvey-1.0/public/themes/ninered/look.png index 4557309..b53c23d 100644 Binary files a/src/ninesurvey-1.0/public/themes/ninered/look.png and b/src/ninesurvey-1.0/public/themes/ninered/look.png differ diff --git a/src/ninesurvey-1.0/public/themes/nineyellow/look.png b/src/ninesurvey-1.0/public/themes/nineyellow/look.png index 49a9118..086a19b 100644 Binary files a/src/ninesurvey-1.0/public/themes/nineyellow/look.png and b/src/ninesurvey-1.0/public/themes/nineyellow/look.png differ diff --git a/src/ninesurvey-1.0/src/Command/CronInitCommand.php b/src/ninesurvey-1.0/src/Command/CronInitCommand.php index ffc9f8d..fcd8744 100644 --- a/src/ninesurvey-1.0/src/Command/CronInitCommand.php +++ b/src/ninesurvey-1.0/src/Command/CronInitCommand.php @@ -62,7 +62,7 @@ class CronInitCommand extends Command $metadata = $this->em->getClassMetaData('App:Cron'); - // Job Notify + // Job Notify Survey // Toute les minutes $entity = $this->em->getRepository('App:Cron')->findOneBy(["command"=>"app:notifySurvey"]); if(!$entity) { @@ -78,6 +78,22 @@ class CronInitCommand extends Command $this->em->persist($entity); } + // Job Notify Quest + // Toute les minutes + $entity = $this->em->getRepository('App:Cron')->findOneBy(["command"=>"app:notifyQuest"]); + if(!$entity) { + $entity = new Cron; + $entity->setCommand("app:notifyQuest"); + $entity->setDescription("Notifications associées aux enquêtes"); + $entity->setStatut(2); + $entity->setRepeatcall(0); + $entity->setRepeatexec(0); + $entity->setRepeatinterval(60); + $entity->setNextexecdate($entity->getSubmitdate()); + + $this->em->persist($entity); + } + // Job Mail // Toute les minutes $entity = $this->em->getRepository('App:Cron')->findOneBy(["command"=>"app:sendMail"]); diff --git a/src/ninesurvey-1.0/src/Command/NotifyQuestCommand.php b/src/ninesurvey-1.0/src/Command/NotifyQuestCommand.php new file mode 100644 index 0000000..ccf6a03 --- /dev/null +++ b/src/ninesurvey-1.0/src/Command/NotifyQuestCommand.php @@ -0,0 +1,186 @@ +container = $container; + $this->em = $em; + $this->router=$router; + } + + protected function configure() + { + $this + ->setName('app:notifyQuest') + ->setDescription("Notifications associées aux enquêtes") + ->setHelp("Notifications associées aux enquêtes") + ->addArgument('cronid', InputArgument::OPTIONAL, 'ID Cron Job') + ->addArgument('lastchance', InputArgument::OPTIONAL, 'Lastchance to run the cron') + ; + } + + protected function execute(InputInterface $input, OutputInterface $output) + { + $this->output = $output; + $this->filesystem = new Filesystem(); + $this->rootlog = $this->container->get('kernel')->getLogDir()."/"; + $this->mail = $this->container->get('app.mail.service'); + $this->weburl = $this->container->getParameter('appWeburl'); + $this->alias = $this->container->getParameter('appAlias'); + $this->noreply = $this->container->getParameter('appMailnoreply'); + + $this->writelnred(''); + $this->writelnred('== app:notifyQuest'); + $this->writelnred('=========================================================================================================='); + + // Envoyer un mail à l'ensemble des invités de enquête + $questguests=$this->em->getRepository("App:Questguest")->findBy(["tonotifyguest"=>true]); + foreach($questguests as $questguest) { + $url=$this->router->generate('app_quest_byguestkey', ["key"=>$questguest->getKey()], UrlGeneratorInterface::ABSOLUTE_URL); + $url=str_replace("http:","https:",$url); + $url=str_replace("/localhost/","/".$this->weburl."/".$this->alias."/",$url); + + $to = $questguest->getEmail(); + $from = $questguest->getQuest()->getUser()->getEmail(); + $subject="Ninesurvey : Invitation à une enquête"; + if($questguest->getQuest()->getPrivate()) { + $body ="Bonjour,
"; + $body.="Je vous invite à répondre à l'enquête suivante : ".$questguest->getQuest()->getTitle().".
"; + $body.="Pour ce faire, veuillez cliquer sur le lien ci-après: accéder à l'enquête.
"; + } + else { + $body ="Bonjour,
"; + $body.="Voici le lien qui vous permettra de modifier votre réponse à l'enquête : ".$questguest->getQuest()->getTitle().".
"; + $body.="Pour ce faire, veuillez cliquer sur le lien ci-après: accéder à l'enquête.
"; + } + + $this->mail->sendEmail($subject, $body, $to, $from); + + $questguest->setTonotifyguest(false); + $this->em->persist($questguest); + $this->em->flush(); + } + + // Envoyer un mail à l'ensemble des propriétaires + $quests=$this->em->getRepository("App:Quest")->findBy(["notification"=>true]); + foreach($quests as $quest) { + $questguests=$this->em->getRepository("App:Questguest")->findBy(["quest"=>$quest,"tonotifyowner"=>true]); + foreach($questguests as $questguest) { + $url=$this->router->generate('app_quest_byuserkey', ["key"=>$quest->getId()], UrlGeneratorInterface::ABSOLUTE_URL); + $url=str_replace("http:","https:",$url); + $url=str_replace("/localhost/","/".$this->weburl."/".$this->alias."/",$url); + + $to = $quest->getUser()->getEmail(); + $from = $this->noreply; + $subject="Ninesurvey : Réponse à votre enquête"; + $body ="Bonjour,

"; + if($questguest->getEmail()!=$questguest->getDisplayname()) $body.=$questguest->getDisplayname()."
"; + $body.=$questguest->getEmail()."
"; + + $body.="
Viens de répondre à votre enquête : ".$questguest->getQuest()->getTitle().".
"; + $body.="Pour consulter le résultat, veuillez cliquer sur le lien ci-après: accéder à l'enquête.
"; + + $this->mail->sendEmail($subject, $body, $to, $from); + + $questguest->setTonotifyowner(false); + $this->em->persist($questguest); + $this->em->flush(); + } + } + + // Envoyer notification de résultat + $quests=$this->em->getRepository("App:Quest")->findBy(["tonotifyclose"=>true,"tonotifyopen"=>false]); + foreach($quests as $quest) { + + $questguests=$this->em->getRepository("App:Questguest")->findBy(["quest"=>$quest]); + foreach($questguests as $questguest) { + $url=$this->router->generate('app_quest_byguestkey', ["key"=>$questguest->getKey()], UrlGeneratorInterface::ABSOLUTE_URL); + $url=str_replace("http:","https:",$url); + $url=str_replace("/localhost/","/".$this->weburl."/".$this->alias."/",$url); + + $to = $questguest->getEmail(); + $from = $quest->getUser()->getEmail(); + $subject="Ninesurvey : Résultat de votre enquête"; + $body = $quest->getTonotifymessage(); + $body = str_replace("#LINK#",$url,$body); + + $this->mail->sendEmail($subject, $body, $to, $from); + } + + $quest->setTonotifyclose(false); + $this->em->persist($quest); + $this->em->flush(); + } + + // Envoyer notification de réouverture + $quests=$this->em->getRepository("App:Quest")->findBy(["tonotifyclose"=>false,"tonotifyopen"=>true]); + foreach($quests as $quest) { + $questguests=$this->em->getRepository("App:Questguest")->findBy(["quest"=>$quest]); + foreach($questguests as $questguest) { + $url=$this->router->generate('app_quest_byguestkey', ["key"=>$questguest->getKey()], UrlGeneratorInterface::ABSOLUTE_URL); + $url=str_replace("http:","https:",$url); + $url=str_replace("/localhost/","/".$this->weburl."/".$this->alias."/",$url); + + $to = $questguest->getEmail(); + $from = $quest->getUser()->getEmail(); + $subject="Ninesurvey : Réouverture de votre enquête"; + $body = $quest->getTonotifymessage(); + $body = str_replace("#LINK#",$url,$body); + + $this->mail->sendEmail($subject, $body, $to, $from); + } + + $quest->setTonotifyopen(false); + $this->em->persist($quest); + $this->em->flush(); + } + + // Annuler les nofications simultanées + $quests=$this->em->getRepository("App:Quest")->findBy(["tonotifyclose"=>true,"tonotifyopen"=>true]); + foreach($quests as $quest) { + $quest->setTonotifyclose(false); + $quest->setTonotifyopen(false); + $this->em->persist($quest); + $this->em->flush(); + } + + $this->writeln(''); + return 1; + } + + private function writelnred($string) { + $this->output->writeln(''.$string.''); + $this->filesystem->appendToFile($this->rootlog.'cron.log', $string."\n"); + } + private function writeln($string) { + $this->output->writeln($string); + $this->filesystem->appendToFile($this->rootlog.'cron.log', $string."\n"); + } + + + +} diff --git a/src/ninesurvey-1.0/src/Command/NotifySurveyCommand.php b/src/ninesurvey-1.0/src/Command/NotifySurveyCommand.php index 9b5d28f..6670a0f 100644 --- a/src/ninesurvey-1.0/src/Command/NotifySurveyCommand.php +++ b/src/ninesurvey-1.0/src/Command/NotifySurveyCommand.php @@ -58,38 +58,38 @@ class NotifySurveyCommand extends Command $this->writelnred('=========================================================================================================='); // Envoyer un mail à l'ensemble des invités de sondage - $guests=$this->em->getRepository("App:Guest")->findBy(["tonotifyguest"=>true]); - foreach($guests as $guest) { - $url=$this->router->generate('app_survey_byguestkey', ["key"=>$guest->getKey()], UrlGeneratorInterface::ABSOLUTE_URL); + $surveyguests=$this->em->getRepository("App:Surveyguest")->findBy(["tonotifyguest"=>true]); + foreach($surveyguests as $surveyguest) { + $url=$this->router->generate('app_survey_byguestkey', ["key"=>$surveyguest->getKey()], UrlGeneratorInterface::ABSOLUTE_URL); $url=str_replace("http:","https:",$url); $url=str_replace("/localhost/","/".$this->weburl."/".$this->alias."/",$url); - $to = $guest->getEmail(); - $from = $guest->getSurvey()->getUser()->getEmail(); + $to = $surveyguest->getEmail(); + $from = $surveyguest->getSurvey()->getUser()->getEmail(); $subject="Ninesurvey : Invitation à un sondage de date"; - if($guest->getSurvey()->getPrivate()) { + if($surveyguest->getSurvey()->getPrivate()) { $body ="Bonjour,
"; - $body.="Je vous invite à répondre au sondage suivant : ".$guest->getSurvey()->getTitle().".
"; + $body.="Je vous invite à répondre au sondage suivant : ".$surveyguest->getSurvey()->getTitle().".
"; $body.="Pour ce faire, veuillez cliquer sur le lien ci-après: accéder au sondage.
"; } else { $body ="Bonjour,
"; - $body.="Voici le lien qui vous permettra de modifier votre réponse au sondage : ".$guest->getSurvey()->getTitle().".
"; + $body.="Voici le lien qui vous permettra de modifier votre réponse au sondage : ".$surveyguest->getSurvey()->getTitle().".
"; $body.="Pour ce faire, veuillez cliquer sur le lien ci-après: accéder au sondage.
"; } $this->mail->sendEmail($subject, $body, $to, $from); - $guest->setTonotifyguest(false); - $this->em->persist($guest); + $surveyguest->setTonotifyguest(false); + $this->em->persist($surveyguest); $this->em->flush(); } // Envoyer un mail à l'ensemble des propriétaires $surveys=$this->em->getRepository("App:Survey")->findBy(["notification"=>true]); foreach($surveys as $survey) { - $guests=$this->em->getRepository("App:Guest")->findBy(["survey"=>$survey,"tonotifyowner"=>true]); - foreach($guests as $guest) { + $surveyguests=$this->em->getRepository("App:Surveyguest")->findBy(["survey"=>$survey,"tonotifyowner"=>true]); + foreach($surveyguests as $surveyguest) { $url=$this->router->generate('app_survey_byuserkey', ["key"=>$survey->getId()], UrlGeneratorInterface::ABSOLUTE_URL); $url=str_replace("http:","https:",$url); $url=str_replace("/localhost/","/".$this->weburl."/".$this->alias."/",$url); @@ -98,16 +98,16 @@ class NotifySurveyCommand extends Command $from = $this->noreply; $subject="Ninesurvey : Réponse à votre sondage de date"; $body ="Bonjour,

"; - if($guest->getEmail()!=$guest->getDisplayname()) $body.=$guest->getDisplayname()."
"; - $body.=$guest->getEmail()."
"; + if($surveyguest->getEmail()!=$surveyguest->getDisplayname()) $body.=$surveyguest->getDisplayname()."
"; + $body.=$surveyguest->getEmail()."
"; - $body.="
Viens de répondre à votre sondage : ".$guest->getSurvey()->getTitle().".
"; + $body.="
Viens de répondre à votre sondage : ".$surveyguest->getSurvey()->getTitle().".
"; $body.="Pour consulter le résultat, veuillez cliquer sur le lien ci-après: accéder au sondage.
"; $this->mail->sendEmail($subject, $body, $to, $from); - $guest->setTonotifyowner(false); - $this->em->persist($guest); + $surveyguest->setTonotifyowner(false); + $this->em->persist($surveyguest); $this->em->flush(); } } @@ -116,17 +116,17 @@ class NotifySurveyCommand extends Command $surveys=$this->em->getRepository("App:Survey")->findBy(["tonotifyclose"=>true,"tonotifyopen"=>false]); foreach($surveys as $survey) { $choiced=""; - $option=$this->em->getRepository("App:Option")->findOneBy(["survey"=>$survey,"choiced"=>true]); - if($option) $choiced=$option->getDate()->format("d/m/Y H:i"); + $surveyoption=$this->em->getRepository("App:Surveyoption")->findOneBy(["survey"=>$survey,"choiced"=>true]); + if($surveyoption) $choiced=$surveyoption->getDate()->format("d/m/Y H:i"); - $guests=$this->em->getRepository("App:Guest")->findBy(["survey"=>$survey]); - foreach($guests as $guest) { - $url=$this->router->generate('app_survey_byguestkey', ["key"=>$guest->getKey()], UrlGeneratorInterface::ABSOLUTE_URL); + $surveyguests=$this->em->getRepository("App:Surveyguest")->findBy(["survey"=>$survey]); + foreach($surveyguests as $surveyguest) { + $url=$this->router->generate('app_survey_byguestkey', ["key"=>$surveyguest->getKey()], UrlGeneratorInterface::ABSOLUTE_URL); $url=str_replace("http:","https:",$url); $url=str_replace("/localhost/","/".$this->weburl."/".$this->alias."/",$url); - $to = $guest->getEmail(); + $to = $surveyguest->getEmail(); $from = $survey->getUser()->getEmail(); $subject="Ninesurvey : Résultat de votre sondage de date"; $body = $survey->getTonotifymessage(); @@ -144,13 +144,13 @@ class NotifySurveyCommand extends Command // Envoyer notification de réouverture $surveys=$this->em->getRepository("App:Survey")->findBy(["tonotifyclose"=>false,"tonotifyopen"=>true]); foreach($surveys as $survey) { - $guests=$this->em->getRepository("App:Guest")->findBy(["survey"=>$survey]); - foreach($guests as $guest) { - $url=$this->router->generate('app_survey_byguestkey', ["key"=>$guest->getKey()], UrlGeneratorInterface::ABSOLUTE_URL); + $surveyguests=$this->em->getRepository("App:Surveyguest")->findBy(["survey"=>$survey]); + foreach($surveyguests as $surveyguest) { + $url=$this->router->generate('app_survey_byguestkey', ["key"=>$surveyguest->getKey()], UrlGeneratorInterface::ABSOLUTE_URL); $url=str_replace("http:","https:",$url); $url=str_replace("/localhost/","/".$this->weburl."/".$this->alias."/",$url); - $to = $guest->getEmail(); + $to = $surveyguest->getEmail(); $from = $survey->getUser()->getEmail(); $subject="Ninesurvey : Réouverture de votre sondage de date"; $body = $survey->getTonotifymessage(); diff --git a/src/ninesurvey-1.0/src/Command/SynchroUsersCommand.php b/src/ninesurvey-1.0/src/Command/SynchroUsersCommand.php index 3b74353..6c613b9 100644 --- a/src/ninesurvey-1.0/src/Command/SynchroUsersCommand.php +++ b/src/ninesurvey-1.0/src/Command/SynchroUsersCommand.php @@ -419,9 +419,9 @@ class SynchroUsersCommand extends Command $appmasterurl = $this->container->getParameter("appMasterurl"); $appmasterkey = $this->container->getParameter("appMasterkey"); - // Généraltion de l'urol de communication + // Généraltion de l'url de communication if(stripos($appmasterurl,"/")===0) { - $url="https://".$this->container->getParameter("appWeburl").$appmasterurl; + $url="http://".$this->container->getParameter("appWeburl").$appmasterurl; } else $url=$appmasterurl; @@ -441,6 +441,7 @@ class SynchroUsersCommand extends Command } catch (\Exception $e) { // On tente avec le proxy s'il y en a un + echo "pouet"; $proxyUse = $this->container->getParameter("proxyUse"); if($proxyUse) { $proxyHost = $this->container->getParameter("proxyHost"); diff --git a/src/ninesurvey-1.0/src/Controller/QuestController.php b/src/ninesurvey-1.0/src/Controller/QuestController.php index 7f43b37..f5c7a64 100644 --- a/src/ninesurvey-1.0/src/Controller/QuestController.php +++ b/src/ninesurvey-1.0/src/Controller/QuestController.php @@ -331,15 +331,15 @@ class QuestController extends AbstractController if($status==1) { $quest->setTonotifyclose(true); - $quest->setTonotifymessage("Bonjour,

Après sondage la date suivante a été retenue pour notre réunion : ".$quest->getTitle()."

#DATE#

Merci de votre présence.

Vous pouvez consulter les réponses au songage via le lien ci-après: accéder au sondage

Cordialement
".$quest->getUser()->getDisplayname()); + $quest->setTonotifymessage("Bonjour,

L'enquête suivante est à présent close : ".$quest->getTitle()."

Merci de votre réponse.

Vous pouvez consulter les résultats de l'enquête via le lien ci-après: accéder au résultat de l'enquête

Cordialement
".$quest->getUser()->getDisplayname()); } else { $quest->setTonotifyopen(true); - $quest->setTonotifymessage("Bonjour,

Le sondage suivant a été réouvert : ".$quest->getTitle()."

Vous pouvez de nouveau répondre au songage via le lien ci-après: accéder au sondage.

Cordialement
".$quest->getUser()->getDisplayname()); + $quest->setTonotifymessage("Bonjour,

L'enquête suivante est à présent réouverte: ".$quest->getTitle()."

Vous pouvez de nouveau modifier vos réponses via le lien ci-après: accéder à l'enquête.

Cordialement
".$quest->getUser()->getDisplayname()); } // Création du formulaire - $form = $this->createForm(QueststatusType::class,$quest,array("result"=>$quest->getResult(),"status"=>$status)); + $form = $this->createForm(QueststatusType::class,$quest,array("status"=>$status)); // Récupération des data du formulaire $form->handleRequest($request); @@ -347,27 +347,7 @@ class QuestController extends AbstractController // Sur validation if ($form->get('submit')->isClicked() && $form->isValid()) { $data = $form->getData(); - - // Pour chaque questoptions du suvery les placer comme non choisie - $questoptions=$em->getRepository("App:Questoption")->findBy(["quest"=>$quest]); - foreach($questoptions as $questoption) { - $questoption->setChoiced(false); - $em->persist($questoption); - $em->flush(); - } - - // Placer l'questoption selectionné comme choisie - if($status==1) { - $isresult=$form->get("isresult")->getData(); - - $questoption=$em->getRepository("App:Questoption")->find($isresult); - if($questoption) { - $questoption->setChoiced(true); - $em->persist($questoption); - $em->flush(); - } - } - + $em->persist($data); $em->flush(); @@ -402,13 +382,13 @@ class QuestController extends AbstractController return $this->render('Response/questvote.html.twig',[ 'useheader' => true, 'usesidebar' => false, - 'questguest' => $questguest, + 'questguest' => $questguest, 'form' => $form->createView(), 'by' => "byuserkey", ]); } - public function byquestguestkey($key,Request $request) + public function byguestkey($key,Request $request) { $em = $this->getDoctrine()->getManager(); @@ -422,14 +402,14 @@ class QuestController extends AbstractController ]); } - $this->questvote($request,$form,$questguest,"byquestguestkey"); + $this->questvote($request,$form,$questguest,"byguestkey"); return $this->render('Response/questvote.html.twig',[ 'useheader' => true, 'usesidebar' => false, 'questguest' => $questguest, 'form' => $form->createView(), - 'by' => "byquestguestkey", + 'by' => "byguestkey", ]); } @@ -531,7 +511,7 @@ class QuestController extends AbstractController $em->persist($questguest); $em->flush(); - return $this->redirect($this->generateUrl('app_quest_byquestguestkey',["key"=>$questguest->getKey()])); + return $this->redirect($this->generateUrl('app_quest_byguestkey',["key"=>$questguest->getKey()])); } return $this->render('Quest/byquestkey.html.twig',[ @@ -678,11 +658,9 @@ class QuestController extends AbstractController $questoptions=$em->getRepository("App:Questoption")->findBy(["quest"=>$quest],["roworder"=>"ASC"]); // On s'assure que le quest appartient bien à l'utilisateur - /* if($this->getUser()!=$quest->getUser()) { return $this->redirect($this->generateUrl('app_quest')); } - */ $graphs=[]; $tbcolor=array("red"=>"#CF000F","green"=>"#3FC380","blue"=>"#446CB3","orange"=>"#F89406"); @@ -794,7 +772,7 @@ class QuestController extends AbstractController } } } - + if($type!="pdf") { return $this->render('Quest/result.html.twig',[ 'useheader' => true, @@ -807,7 +785,7 @@ class QuestController extends AbstractController else { $rootdir = $this->appKernel->getProjectDir(); - $filename="F".str_pad($id,5,"0",STR_PAD_LEFT).".pdf"; + $filename="Enquete-".str_pad($id,5,"0",STR_PAD_LEFT).".pdf"; $fileloc=$rootdir."/uploads/quest/".$filename; $fs = new Filesystem(); @@ -826,47 +804,6 @@ class QuestController extends AbstractController $render=str_replace("/ninesurvey/","https://ninegate.ac-arno.fr/ninesurvey/",$render); $this->knpSnappy->generateFromHtml($render,$fileloc); return $this->file($fileloc); - - - /* - $pdfOptions = new Options(); - //$pdfOptions->set('defaultFont', 'Arial'); - $pdfOptions->set('isHtml5ParserEnabled', TRUE); - $pdfOptions->set('isJavascriptEnabled', TRUE); - $pdfOptions->set('debugLayout',TRUE); - $pdfOptions->set('debugCss',TRUE); - - - $dompdf = new Dompdf($pdfOptions); - $renderpdf = $this->renderView('Quest/result.html.twig',[ - 'useheader' => false, - 'usesidebar' => false, - 'sondeUse' => false, - 'quest' => $quest, - 'questguests' => $questguests, - 'graphs' => $graphs, - 'type' => $type, - ]); - $renderpdf=str_replace("/".$this->getParameter('appAlias')."/", "https://".$this->getParameter('appWeburl')."/".$this->getParameter('appAlias')."/",$renderpdf); - //dump($renderpdf); - - // Load HTML to Dompdf - $dompdf->loadHtml($renderpdf); - - // (Optional) Setup the paper size and orientation 'portrait' or 'portrait' - $dompdf->setPaper('A4', 'portrait'); - - // Render the HTML as PDF - $dompdf->render(); - - // Output the generated PDF to Browser (force download) - - $dompdf->stream("mypdf.pdf", [ - "Attachment" => true - ]); - - $dompdf->stream("mypdf.pdf"); - */ } } } diff --git a/src/ninesurvey-1.0/src/Controller/SurveyController.php b/src/ninesurvey-1.0/src/Controller/SurveyController.php index 10a6717..dfbef06 100644 --- a/src/ninesurvey-1.0/src/Controller/SurveyController.php +++ b/src/ninesurvey-1.0/src/Controller/SurveyController.php @@ -10,11 +10,11 @@ use Ramsey\Uuid\Uuid; use App\Entity\Survey; -use App\Entity\Option; -use App\Entity\Guest; -use App\Entity\Vote; +use App\Entity\Surveyoption; +use App\Entity\Surveyguest; +use App\Entity\Surveyvote; -use App\Form\GuestType as GuestType; +use App\Form\SurveyguestType as SurveyguestType; use App\Form\SurveykeyType as SurveykeyType; use App\Form\SurveystatusType as SurveystatusType; @@ -22,12 +22,11 @@ class SurveyController extends AbstractController { public function list() { - $guests=$this->getUser()->getGuests(); - + $surveyguests=$this->getUser()->getSurveyguests(); return $this->render('Survey/survey.html.twig', [ - 'useheader' => true, - 'usesidebar' => false, - 'guests' => $guests, + 'useheader' => true, + 'usesidebar' => false, + 'surveyguests' => $surveyguests, ]); } @@ -46,7 +45,7 @@ class SurveyController extends AbstractController $flow->bind($survey); $form = $flow->createForm(); - + $return = $this->edit($flow,$form,$survey); if($return) return $this->redirect($this->generateUrl('app_survey')); @@ -65,12 +64,12 @@ class SurveyController extends AbstractController $em = $this->getDoctrine()->getManager(); $survey=$em->getRepository("App:Survey")->find($id); - // Construction de la chaine jsonoptions - $options=$em->getRepository("App:Option")->findBy(["survey"=>$survey],["date"=>"ASC"]); + // Construction de la chaine jsonsurveyoptions + $surveyoptions=$em->getRepository("App:Surveyoption")->findBy(["survey"=>$survey],["date"=>"ASC"]); $tbdates=[]; - foreach($options as $option) { - $date=$option->getDate()->format("Y-m-d"); - $hour=$option->getDate()->format("H : i"); + foreach($surveyoptions as $surveyoption) { + $date=$surveyoption->getDate()->format("Y-m-d"); + $hour=$surveyoption->getDate()->format("H : i"); if(!array_key_exists($date,$tbdates)) { $tbdates[$date]=["date"=>$date,"hours"=>[]]; @@ -79,24 +78,24 @@ class SurveyController extends AbstractController if(!in_array($hour,$tbdates[$date]["hours"])) array_push($tbdates[$date]["hours"],$hour); } - $jsonoptions="["; + $jsonsurveyoptions="["; $i=0; foreach($tbdates as $date) { - if($i>0) $jsonoptions.=","; - $jsonoptions.=json_encode($date); + if($i>0) $jsonsurveyoptions.=","; + $jsonsurveyoptions.=json_encode($date); $i++; } - $jsonoptions.="]"; - $survey->setJsonoptions($jsonoptions); + $jsonsurveyoptions.="]"; + $survey->setJsonsurveyoptions($jsonsurveyoptions); - // Construction de la chaine jsonguests - $guests=$em->getRepository("App:Guest")->findBy(["survey"=>$survey],["email"=>"ASC"]); - $tbguests=[]; - foreach($guests as $guest) { - array_push($tbguests,$guest->getEmail()); + // Construction de la chaine jsonsurveyguests + $surveyguests=$em->getRepository("App:Surveyguest")->findBy(["survey"=>$survey],["email"=>"ASC"]); + $tbsurveyguests=[]; + foreach($surveyguests as $surveyguest) { + array_push($tbsurveyguests,$surveyguest->getEmail()); } - $survey->setJsonguests(json_encode($tbguests)); + $survey->setJsonsurveyguests(json_encode($tbsurveyguests)); $flow->bind($survey); @@ -125,12 +124,12 @@ class SurveyController extends AbstractController } if ($flow->isValid($form)) { - // Controle de validité étape options + // Controle de validité étape surveyoptions if($flow->getCurrentStepNumber()=="2") { $data=$form->getData(); - $jsonoptions=$data->getJsonoptions(); - if(!$jsonoptions||$jsonoptions=="[]") { + $jsonsurveyoptions=$data->getJsonsurveyoptions(); + if(!$jsonsurveyoptions||$jsonsurveyoptions=="[]") { $form->addError(new FormError("Votre sondage doit comporter au minimum un horaire")); } @@ -141,13 +140,13 @@ class SurveyController extends AbstractController } } - // Controle de validité étape guests + // Controle de validité étape surveyguests if($flow->getCurrentStepNumber()=="3") { $data=$form->getData(); if($survey->getPrivate()) { - $jsonguests=$data->getJsonguests(); - if(!$jsonguests||$jsonguests=="[]") { + $jsonsurveyguests=$data->getJsonsurveyguests(); + if(!$jsonsurveyguests||$jsonsurveyguests=="[]") { $form->addError(new FormError("Votre sondage doit comporter au minimum un invité")); } @@ -168,23 +167,23 @@ class SurveyController extends AbstractController // Sauvegarde du sondage $em->persist($survey); - // Sauvegarde des options + // Sauvegarde des surveyoptions $data=$form->getData(); - $jsonoptions=json_decode($data->getJsonoptions()); - $tboptions=[]; - foreach($jsonoptions as $date) { + $jsonsurveyoptions=json_decode($data->getJsonsurveyoptions()); + $tbsurveyoptions=[]; + foreach($jsonsurveyoptions as $date) { foreach($date->hours as $hour ) { $hour=str_replace(" ","",$hour); - $dateoption= new \DateTime($date->date." ".$hour); - array_push($tboptions,$dateoption); + $datesurveyoption= new \DateTime($date->date." ".$hour); + array_push($tbsurveyoptions,$datesurveyoption); - $option=$em->getRepository("App:Option")->findOneBy(["date"=>$dateoption,"survey"=>$survey]); - if(!$option) { - $option=new Option(); - $option->setDate($dateoption); - $option->setSurvey($survey); - $option->setChoiced(false); - $em->persist($option); + $surveyoption=$em->getRepository("App:Surveyoption")->findOneBy(["date"=>$datesurveyoption,"survey"=>$survey]); + if(!$surveyoption) { + $surveyoption=new Surveyoption(); + $surveyoption->setDate($datesurveyoption); + $surveyoption->setSurvey($survey); + $surveyoption->setChoiced(false); + $em->persist($surveyoption); } } } @@ -192,18 +191,18 @@ class SurveyController extends AbstractController // Sauvegarde des invités if($survey->getPrivate()) { $data=$form->getData(); - $jsonguest=json_decode($data->getJsonguests()); - $tbguests=[]; + $jsonsurveyguest=json_decode($data->getJsonsurveyguests()); + $tbsurveyguests=[]; // On ajoute le propriétaire du sondage en tant qu'invité si ce n'est pas le cas - if(!in_array($this->getUser()->getEmail(),$jsonguest)) array_push($jsonguest,$this->getUser()->getEmail()); + if(!in_array($this->getUser()->getEmail(),$jsonsurveyguest)) array_push($jsonsurveyguest,$this->getUser()->getEmail()); - foreach($jsonguest as $email) { - array_push($tbguests,$email); + foreach($jsonsurveyguest as $email) { + array_push($tbsurveyguests,$email); $user=$em->getRepository("App:User")->findOneBy(["email"=>$email]); - $guest=$em->getRepository("App:Guest")->findOneBy(["email"=>$email,"survey"=>$survey]); - if(!$guest) { + $surveyguest=$em->getRepository("App:Surveyguest")->findOneBy(["email"=>$email,"survey"=>$survey]); + if(!$surveyguest) { $key = Uuid::uuid4(); $displayname=$email; $tonotifyguest=true; @@ -212,42 +211,42 @@ class SurveyController extends AbstractController $tonotifyguest=($user!=$this->getUser()); } - $guest=new Guest(); - $guest->setEmail($email); - $guest->setDisplayname($displayname); - $guest->setKey($key); - $guest->setSurvey($survey); - $guest->setTonotifyguest($tonotifyguest); - $guest->setTonotifyowner(false); + $surveyguest=new Surveyguest(); + $surveyguest->setEmail($email); + $surveyguest->setDisplayname($displayname); + $surveyguest->setKey($key); + $surveyguest->setSurvey($survey); + $surveyguest->setTonotifyguest($tonotifyguest); + $surveyguest->setTonotifyowner(false); } - $guest->setUser($user); - $em->persist($guest); + $surveyguest->setUser($user); + $em->persist($surveyguest); } // Suppression des invités obsolète - $guests=$survey->getGuests(); - foreach($guests as $guest) { - if(!in_array($guest->getEmail(),$tbguests)) { - $em->remove($guest); + $surveyguests=$survey->getSurveyguests(); + foreach($surveyguests as $surveyguest) { + if(!in_array($surveyguest->getEmail(),$tbsurveyguests)) { + $em->remove($surveyguest); } } } else { // On ajoute qu'il arrive le propriétaire en tant qu'invité - $guest=$em->getRepository("App:Guest")->findOneBy(["email"=>$this->getUser()->getEmail(),"survey"=>$survey]); - if(!$guest) { + $surveyguest=$em->getRepository("App:Surveyguest")->findOneBy(["email"=>$this->getUser()->getEmail(),"survey"=>$survey]); + if(!$surveyguest) { $key = Uuid::uuid4(); - $guest=new Guest(); - $guest->setEmail($this->getUser()->getEmail()); - $guest->setDisplayname($this->getUser()->getDisplayname()); - $guest->setKey($key); - $guest->setSurvey($survey); - $guest->setTonotifyguest(false); - $guest->setTonotifyowner(false); + $surveyguest=new Surveyguest(); + $surveyguest->setEmail($this->getUser()->getEmail()); + $surveyguest->setDisplayname($this->getUser()->getDisplayname()); + $surveyguest->setKey($key); + $surveyguest->setSurvey($survey); + $surveyguest->setTonotifyguest(false); + $surveyguest->setTonotifyowner(false); } - $guest->setUser($this->getUser()); - $em->persist($guest); + $surveyguest->setUser($this->getUser()); + $em->persist($surveyguest); } $em->flush(); @@ -293,11 +292,11 @@ class SurveyController extends AbstractController if($status==1) { $survey->setTonotifyclose(true); - $survey->setTonotifymessage("Bonjour,

Après sondage la date suivante a été retenue pour notre réunion : ".$survey->getTitle()."

#DATE#

Merci de votre présence.

Vous pouvez consulter les réponses au songage via le lien ci-après: accéder au sondage

Cordialement
".$survey->getUser()->getDisplayname()); + $survey->setTonotifymessage("Bonjour,

Après sondage la date suivante a été retenue pour notre réunion : ".$survey->getTitle()."

#DATE#

Merci de votre présence.

Vous pouvez consulter les réponses au sondage via le lien ci-après: accéder au sondage

Cordialement
".$survey->getUser()->getDisplayname()); } else { $survey->setTonotifyopen(true); - $survey->setTonotifymessage("Bonjour,

Le sondage suivant a été réouvert : ".$survey->getTitle()."

Vous pouvez de nouveau répondre au songage via le lien ci-après: accéder au sondage.

Cordialement
".$survey->getUser()->getDisplayname()); + $survey->setTonotifymessage("Bonjour,

Le sondage suivant a été réouvert : ".$survey->getTitle()."

Vous pouvez de nouveau répondre au sondage via le lien ci-après: accéder au sondage.

Cordialement
".$survey->getUser()->getDisplayname()); } // Création du formulaire @@ -310,22 +309,22 @@ class SurveyController extends AbstractController if ($form->get('submit')->isClicked() && $form->isValid()) { $data = $form->getData(); - // Pour chaque options du suvery les placer comme non choisie - $options=$em->getRepository("App:Option")->findBy(["survey"=>$survey]); - foreach($options as $option) { - $option->setChoiced(false); - $em->persist($option); + // Pour chaque surveyoptions du suvery les placer comme non choisie + $surveyoptions=$em->getRepository("App:Surveyoption")->findBy(["survey"=>$survey]); + foreach($surveyoptions as $surveyoption) { + $surveyoption->setChoiced(false); + $em->persist($surveyoption); $em->flush(); } - // Placer l'option selectionné comme choisie + // Placer surveyoption selectionné comme choisie if($status==1) { $isresult=$form->get("isresult")->getData(); - $option=$em->getRepository("App:Option")->find($isresult); - if($option) { - $option->setChoiced(true); - $em->persist($option); + $surveyoption=$em->getRepository("App:Surveyoption")->find($isresult); + if($surveyoption) { + $surveyoption->setChoiced(true); + $em->persist($surveyoption); $em->flush(); } } @@ -350,21 +349,21 @@ class SurveyController extends AbstractController $em = $this->getDoctrine()->getManager(); // Recherche de l'utilisateur dans le sondage - $guest = $em->getRepository("App:Guest")->findOneBy(["survey"=>$key,"user"=>$this->getUser()]); - if(!$guest) { + $surveyguest = $em->getRepository("App:Surveyguest")->findOneBy(["survey"=>$key,"user"=>$this->getUser()]); + if(!$surveyguest) { return $this->render('Response/nokey.html.twig',[ 'useheader' => true, 'usesidebar' => false, ]); } - $return = $this->vote($request,$form,$guest,"byuserkey"); + $return = $this->surveyvote($request,$form,$surveyguest,"byuserkey"); if($return) return $this->redirect($this->generateUrl('app_survey')); - return $this->render('Response/vote.html.twig',[ + return $this->render('Response/surveyvote.html.twig',[ 'useheader' => true, 'usesidebar' => false, - 'guest' => $guest, + 'surveyguest' => $surveyguest, 'form' => $form->createView(), 'by' => "byuserkey", ]); @@ -375,21 +374,21 @@ class SurveyController extends AbstractController $em = $this->getDoctrine()->getManager(); // Recherche de la clé d'invitation - $guest = $em->getRepository("App:Guest")->findOneBy(["key"=>$key]); + $surveyguest = $em->getRepository("App:Surveyguest")->findOneBy(["key"=>$key]); - if(!$guest) { + if(!$surveyguest) { return $this->render('Response/nokey.html.twig',[ 'useheader' => true, 'usesidebar' => false, ]); } - $this->vote($request,$form,$guest,"byguestkey"); + $this->surveyvote($request,$form,$surveyguest,"bysurveyguestkey"); - return $this->render('Response/vote.html.twig',[ + return $this->render('Response/surveyvote.html.twig',[ 'useheader' => true, 'usesidebar' => false, - 'guest' => $guest, + 'surveyguest' => $surveyguest, 'form' => $form->createView(), 'by' => "byguestkey", ]); @@ -418,22 +417,22 @@ class SurveyController extends AbstractController // Si la personne est déjà connectée : on génère une invitation et on le redirige via un accès user if($this->getUser()) { - $guest = $em->getRepository("App:Guest")->findOneBy(["survey"=>$survey,"user"=>$this->getUser()]); - if(!$guest) { + $surveyguest = $em->getRepository("App:Surveyguest")->findOneBy(["survey"=>$survey,"user"=>$this->getUser()]); + if(!$surveyguest) { $key = Uuid::uuid4(); $email=$this->getUser()->getEmail(); $displayname=$this->getUser()->getDisplayname(); $tonotifyguest=true; - $guest=new Guest(); - $guest->setEmail($email); - $guest->setDisplayname($displayname); - $guest->setKey($key); - $guest->setSurvey($survey); - $guest->setTonotifyguest($tonotifyguest); - $guest->setTonotifyowner(false); - $guest->setUser($this->getUser()); - $em->persist($guest); + $surveyguest=new Surveyguest(); + $surveyguest->setEmail($email); + $surveyguest->setDisplayname($displayname); + $surveyguest->setKey($key); + $surveyguest->setSurvey($survey); + $surveyguest->setTonotifyguest($tonotifyguest); + $surveyguest->setTonotifyowner(false); + $surveyguest->setUser($this->getUser()); + $em->persist($surveyguest); $em->flush(); } @@ -442,7 +441,7 @@ class SurveyController extends AbstractController // Initialisation de l'enregistrement - $data = new Guest(); + $data = new Surveyguest(); // Création du formulaire $form = $this->createForm(SurveykeyType::class,$data); @@ -452,14 +451,14 @@ class SurveyController extends AbstractController // S'assurer que la personne n'a pas déjà voté // Si c'est le cas il ne devrait plus utiliser cette url - // On lui retourne l'url associé à son vote + // On lui retourne l'url associé à son surveyvote if ($form->get('submit')->isClicked()) { $data = $form->getData(); $email=$data->getEmail(); - $guest=$em->getRepository("App:Guest")->findOneBy(["survey"=>$survey,"email"=>$email]); - if($guest) { - $guest->setTonotifyguest(true); - $em->persist($guest); + $surveyguest=$em->getRepository("App:Surveyguest")->findOneBy(["survey"=>$survey,"email"=>$email]); + if($surveyguest) { + $surveyguest->setTonotifyguest(true); + $em->persist($surveyguest); $em->flush(); // Initialiser l'erreur @@ -475,25 +474,25 @@ class SurveyController extends AbstractController if ($form->get('submit')->isClicked()&&$form->isValid()) { $user=$em->getRepository("App:User")->findOneBy(["email"=>$email]); - $guest=$em->getRepository("App:Guest")->findOneBy(["email"=>$email,"survey"=>$survey]); - if(!$guest) { + $surveyguest=$em->getRepository("App:Surveyguest")->findOneBy(["email"=>$email,"survey"=>$survey]); + if(!$surveyguest) { $key = Uuid::uuid4(); $displayname=$data->getDisplayname(); $tonotifyguest=true; - $guest=new Guest(); - $guest->setEmail($email); - $guest->setDisplayname($displayname); - $guest->setKey($key); - $guest->setSurvey($survey); - $guest->setTonotifyguest($tonotifyguest); - $guest->setTonotifyowner(false); + $surveyguest=new Surveyguest(); + $surveyguest->setEmail($email); + $surveyguest->setDisplayname($displayname); + $surveyguest->setKey($key); + $surveyguest->setSurvey($survey); + $surveyguest->setTonotifyguest($tonotifyguest); + $surveyguest->setTonotifyowner(false); } - $guest->setUser($user); - $em->persist($guest); + $surveyguest->setUser($user); + $em->persist($surveyguest); $em->flush(); - return $this->redirect($this->generateUrl('app_survey_byguestkey',["key"=>$guest->getKey()])); + return $this->redirect($this->generateUrl('app_survey_byguestkey',["key"=>$surveyguest->getKey()])); } return $this->render('Survey/bysurveykey.html.twig',[ @@ -527,22 +526,22 @@ class SurveyController extends AbstractController // Si la personne est déjà connectée : on génère une invitation et on le redirige via un accès user if($this->getUser()) { - $guest = $em->getRepository("App:Guest")->findOneBy(["survey"=>$survey,"user"=>$this->getUser()]); - if(!$guest) { + $surveyguest = $em->getRepository("App:Surveyguest")->findOneBy(["survey"=>$survey,"user"=>$this->getUser()]); + if(!$surveyguest) { $key = Uuid::uuid4(); $email=$this->getUser()->getEmail(); $displayname=$this->getUser()->getDisplayname(); $tonotifyguest=true; - $guest=new Guest(); - $guest->setEmail($email); - $guest->setDisplayname($displayname); - $guest->setKey($key); - $guest->setSurvey($survey); - $guest->setTonotifyguest($tonotifyguest); - $guest->setTonotifyowner(false); - $guest->setUser($this->getUser()); - $em->persist($guest); + $surveyguest=new Surveyguest(); + $surveyguest->setEmail($email); + $surveyguest->setDisplayname($displayname); + $surveyguest->setKey($key); + $surveyguest->setSurvey($survey); + $surveyguest->setTonotifyguest($tonotifyguest); + $surveyguest->setTonotifyowner(false); + $surveyguest->setUser($this->getUser()); + $em->persist($surveyguest); $em->flush(); } @@ -555,66 +554,66 @@ class SurveyController extends AbstractController ]); } - private function vote(&$request,&$form,&$guest,$by) { + private function surveyvote(&$request,&$form,&$surveyguest,$by) { $em = $this->getDoctrine()->getManager(); - // Construction de la chaine jsonvotes - $options=$em->getRepository("App:Option")->findBy(["survey"=>$guest->getSurvey()],["date"=>"ASC"]); - $tbvotes=[]; - foreach($options as $option) { - $id=$option->getId(); + // Construction de la chaine jsonsurveyvotes + $surveyoptions=$em->getRepository("App:Surveyoption")->findBy(["survey"=>$surveyguest->getSurvey()],["date"=>"ASC"]); + $tbsurveyvotes=[]; + foreach($surveyoptions as $surveyoption) { + $id=$surveyoption->getId(); - if(!array_key_exists($id,$tbvotes)) { - $tbvotes[$id]=["id"=>$id,"val"=>""]; + if(!array_key_exists($id,$tbsurveyvotes)) { + $tbsurveyvotes[$id]=["id"=>$id,"val"=>""]; } - $vote=$em->getRepository("App:Vote")->findOneBy(["guest"=>$guest,"option"=>$option]); - if($vote) - $tbvotes[$id]["val"]=(!is_null($vote->getVote())?$vote->getVote():""); + $surveyvote=$em->getRepository("App:Surveyvote")->findOneBy(["surveyguest"=>$surveyguest,"surveyoption"=>$surveyoption]); + if($surveyvote) + $tbsurveyvotes[$id]["val"]=(!is_null($surveyvote->getVote())?$surveyvote->getVote():""); } - $jsonvotes="["; + $jsonsurveyvotes="["; $i=0; - foreach($tbvotes as $vote) { - if($i>0) $jsonvotes.=","; - $jsonvotes.=json_encode($vote); + foreach($tbsurveyvotes as $surveyvote) { + if($i>0) $jsonsurveyvotes.=","; + $jsonsurveyvotes.=json_encode($surveyvote); $i++; } - $jsonvotes.="]"; - $guest->setJsonvotes($jsonvotes); + $jsonsurveyvotes.="]"; + $surveyguest->setJsonsurveyvotes($jsonsurveyvotes); // Création du formulaire - $form = $this->createForm(GuestType::class,$guest,["status"=>$guest->getSurvey()->getStatus()]); + $form = $this->createForm(SurveyguestType::class,$surveyguest,["status"=>$surveyguest->getSurvey()->getStatus()]); // Récupération des data du formulaire $form->handleRequest($request); // Si validation - if($guest->getSurvey()->getStatus()==0) { + if($surveyguest->getSurvey()->getStatus()==0) { if ($form->get('submit')->isClicked() && $form->isValid()) { $data=$form->getData(); - $jsonvotes=json_decode($data->getJsonvotes()); - foreach($jsonvotes as $tovote) { - $option=$em->getRepository("App:Option")->find($tovote->id); - if($option) { - $vote=$em->getRepository("App:Vote")->findOneBy(["guest"=>$guest,"option"=>$option]); - if(!$vote) { - $vote= new Vote(); - $vote->setGuest($guest); - $vote->setOption($option); + $jsonsurveyvotes=json_decode($data->getJsonsurveyvotes()); + foreach($jsonsurveyvotes as $tosurveyvote) { + $surveyoption=$em->getRepository("App:Surveyoption")->find($tosurveyvote->id); + if($surveyoption) { + $surveyvote=$em->getRepository("App:Surveyvote")->findOneBy(["surveyguest"=>$surveyguest,"surveyoption"=>$surveyoption]); + if(!$surveyvote) { + $surveyvote= new Surveyvote(); + $surveyvote->setSurveyguest($surveyguest); + $surveyvote->setSurveyoption($surveyoption); } - $vote->setVote($tovote->val==""?null:$tovote->val); - $em->persist($vote); + $surveyvote->setVote($tosurveyvote->val==""?null:$tosurveyvote->val); + $em->persist($surveyvote); $em->flush(); } } - // Si le vote n'est pas celui du propriétaire : on positionne le flag de notification du owner - if($guest->getUser()!=$guest->getSurvey()->getUser()) { - $guest->setTonotifyowner(true); - $em->persist($vote); + // Si le surveyvote n'est pas celui du propriétaire : on positionne le flag de notification du owner + if($surveyguest->getUser()!=$surveyguest->getSurvey()->getUser()) { + $surveyguest->setTonotifyowner(true); + $em->persist($surveyvote); $em->flush(); } diff --git a/src/ninesurvey-1.0/src/Entity/Survey.php b/src/ninesurvey-1.0/src/Entity/Survey.php index d9cadcd..66ed9c0 100644 --- a/src/ninesurvey-1.0/src/Entity/Survey.php +++ b/src/ninesurvey-1.0/src/Entity/Survey.php @@ -70,59 +70,65 @@ class Survey private $user; /** - * @ORM\OneToMany(targetEntity="App\Entity\Option", mappedBy="survey", cascade={"persist"}, orphanRemoval=true) + * @ORM\OneToMany(targetEntity="App\Entity\Surveyoption", mappedBy="survey", cascade={"persist"}, orphanRemoval=true) */ - private $options; + private $surveyoptions; /** - * @ORM\OneToMany(targetEntity="App\Entity\Guest", mappedBy="survey", cascade={"persist"}, orphanRemoval=true) + * @ORM\OneToMany(targetEntity="App\Entity\Surveyguest", mappedBy="survey", cascade={"persist"}, orphanRemoval=true) */ - private $guests; + private $surveyguests; /** * Calculate - * jsonoptions = formatage des options du survey en une chaine json - * jsonguests = formatage des guests du survey en une chaine json + * jsonsurveyoptions = formatage des options du survey en une chaine json + * jsonsurveyguests = formatage des guests du survey en une chaine json */ - private $jsonoptions; - private $jsonguests; + private $jsonsurveyoptions; + private $jsonsurveyguests; private $result; private $datepurge; - public function setJsonoptions(string $jsonoptions): self + public function __construct() { - $this->jsonoptions = $jsonoptions; + $this->surveyoptions = new ArrayCollection(); + $this->surveyguests = new ArrayCollection(); + } + + public function setJsonsurveyoptions(string $jsonsurveyoptions): self + { + $this->jsonsurveyoptions = $jsonsurveyoptions; return $this; } - public function getJsonoptions(): ?string + public function getJsonsurveyoptions(): ?string { - return $this->jsonoptions; + return $this->jsonsurveyoptions; } - public function setJsonguests(string $jsonguests): self + public function setJsonsurveyguests(string $jsonsurveyguests): self { - $this->jsonguests = $jsonguests; + $this->jsonsurveyguests = $jsonsurveyguests; return $this; } - public function getJsonguests(): ?string + public function getJsonsurveyguests(): ?string { - return $this->jsonguests; + return $this->jsonsurveyguests; } public function getResult(): ?array { $this->result=[]; - foreach($this->guests as $guest) { - foreach($guest->getVotes() as $vote) { - $key=$vote->getOption()->getId(); + foreach($this->getSurveyguests() as $surveyguest) { + foreach($surveyguest->getSurveyvotes() as $vote) { + $key=$vote->getSurveyoption()->getId(); $val=$vote->getVote(); if(!array_key_exists($key,$this->result)) - $this->result[$key]=["id"=>$key,"date"=>$vote->getOption()->getDate(),"count"=>0]; + $this->result[$key]=["id"=>$key,"date"=>$vote->getSurveyoption()->getDate(),"count"=>0]; if(!is_null($val)) $this->result[$key]["count"]+=$val; @@ -138,7 +144,7 @@ class Survey public function getDatepurge() { $this->datepurge=new \DateTime('2000-01-01'); - foreach($this->options as $option) { + foreach($this->surveyoptions as $option) { if($option->getDate()>$this->datepurge) $this->datepurge=clone($option->getDate()); } @@ -147,12 +153,6 @@ class Survey return $this->datepurge; } - public function __construct() - { - $this->options = new ArrayCollection(); - $this->guests = new ArrayCollection(); - } - public function getId(): ?int { return $this->id; @@ -218,80 +218,6 @@ class Survey return $this; } - public function getUser(): ?User - { - return $this->user; - } - - public function setUser(?User $user): self - { - $this->user = $user; - - return $this; - } - - /** - * @return Collection|Option[] - */ - public function getOptions(): Collection - { - return $this->options; - } - - public function addOption(Option $option): self - { - if (!$this->options->contains($option)) { - $this->options[] = $option; - $option->setSurvey($this); - } - - return $this; - } - - public function removeOption(Option $option): self - { - if ($this->options->contains($option)) { - $this->options->removeElement($option); - // set the owning side to null (unless already changed) - if ($option->getSurvey() === $this) { - $option->setSurvey(null); - } - } - - return $this; - } - - /** - * @return Collection|Guest[] - */ - public function getGuests(): Collection - { - return $this->guests; - } - - public function addGuest(Guest $guest): self - { - if (!$this->guests->contains($guest)) { - $this->guests[] = $guest; - $guest->setSurvey($this); - } - - return $this; - } - - public function removeGuest(Guest $guest): self - { - if ($this->guests->contains($guest)) { - $this->guests->removeElement($guest); - // set the owning side to null (unless already changed) - if ($guest->getSurvey() === $this) { - $guest->setSurvey(null); - } - } - - return $this; - } - public function getStatus(): ?int { return $this->status; @@ -340,5 +266,77 @@ class Survey return $this; } + public function getUser(): ?User + { + return $this->user; + } + + public function setUser(?User $user): self + { + $this->user = $user; + + return $this; + } + + /** + * @return Collection|Surveyoption[] + */ + public function getSurveyoptions(): Collection + { + return $this->surveyoptions; + } + + public function addSurveyoption(Surveyoption $surveyoption): self + { + if (!$this->surveyoptions->contains($surveyoption)) { + $this->surveyoptions[] = $surveyoption; + $surveyoption->setSurvey($this); + } + + return $this; + } + + public function removeSurveyoption(Surveyoption $surveyoption): self + { + if ($this->surveyoptions->removeElement($surveyoption)) { + // set the owning side to null (unless already changed) + if ($surveyoption->getSurvey() === $this) { + $surveyoption->setSurvey(null); + } + } + + return $this; + } + + /** + * @return Collection|Surveyguest[] + */ + public function getSurveyguests(): Collection + { + return $this->surveyguests; + } + + public function addSurveyguest(Surveyguest $surveyguest): self + { + if (!$this->surveyguests->contains($surveyguest)) { + $this->surveyguests[] = $surveyguest; + $surveyguest->setSurvey($this); + } + + return $this; + } + + public function removeSurveyguest(Surveyguest $surveyguest): self + { + if ($this->surveyguests->removeElement($surveyguest)) { + // set the owning side to null (unless already changed) + if ($surveyguest->getSurvey() === $this) { + $surveyguest->setSurvey(null); + } + } + + return $this; + } + } diff --git a/src/ninesurvey-1.0/src/Entity/Guest.php b/src/ninesurvey-1.0/src/Entity/Surveyguest.php similarity index 69% rename from src/ninesurvey-1.0/src/Entity/Guest.php rename to src/ninesurvey-1.0/src/Entity/Surveyguest.php index a5cf028..c5ec951 100644 --- a/src/ninesurvey-1.0/src/Entity/Guest.php +++ b/src/ninesurvey-1.0/src/Entity/Surveyguest.php @@ -2,15 +2,15 @@ namespace App\Entity; -use App\Repository\GuestRepository; +use App\Repository\SurveyguestRepository; use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; use Doctrine\ORM\Mapping as ORM; /** - * @ORM\Entity(repositoryClass=GuestRepository::class) + * @ORM\Entity(repositoryClass=SurveyguestRepository::class) */ -class Guest +class Surveyguest { /** * @ORM\Id() @@ -45,44 +45,44 @@ class Guest private $tonotifyowner; /** - * @ORM\ManyToOne(targetEntity="App\Entity\Survey", inversedBy="guests") + * @ORM\ManyToOne(targetEntity="App\Entity\Survey", inversedBy="surveyguests") */ private $survey; /** - * @ORM\ManyToOne(targetEntity="App\Entity\User", inversedBy="guests") + * @ORM\ManyToOne(targetEntity="App\Entity\User", inversedBy="surveyguests") */ private $user; /** - * @ORM\OneToMany(targetEntity="App\Entity\Vote", mappedBy="guest", cascade={"persist"}, orphanRemoval=true) + * @ORM\OneToMany(targetEntity="App\Entity\Surveyvote", mappedBy="surveyguest", cascade={"persist"}, orphanRemoval=true) */ - private $votes; + private $surveyvotes; /** * Calculate - * jsonvotes = formatage des votes du guest en une chaine json + * jsonsurveyvotes = formatage des votes du guest en une chaine json */ - private $jsonvotes; - public function setJsonvotes(string $jsonvotes): self + private $jsonsurveyvotes; + + public function __construct() { - $this->jsonvotes = $jsonvotes; + $this->surveyvotes = new ArrayCollection(); + } + + + public function setJsonsurveyvotes(string $jsonsurveyvotes): self + { + $this->jsonsurveyvotes = $jsonsurveyvotes; return $this; } - public function getJsonvotes(): ?string + public function getJsonsurveyvotes(): ?string { - return $this->jsonvotes; + return $this->jsonsurveyvotes; } - - public function __construct() - { - $this->votes = new ArrayCollection(); - } - - public function getId(): ?int { @@ -174,34 +174,34 @@ class Guest } /** - * @return Collection|Vote[] + * @return Collection|Surveyvote[] */ - public function getVotes(): Collection + public function getSurveyvotes(): Collection { - return $this->votes; + return $this->surveyvotes; } - public function addVote(Vote $vote): self + public function addSurveyvote(Surveyvote $surveyvote): self { - if (!$this->votes->contains($vote)) { - $this->votes[] = $vote; - $vote->setGuest($this); + if (!$this->surveyvotes->contains($surveyvote)) { + $this->surveyvotes[] = $surveyvote; + $surveyvote->setSurveyguest($this); } return $this; } - public function removeVote(Vote $vote): self + public function removeSurveyvote(Surveyvote $surveyvote): self { - if ($this->votes->removeElement($vote)) { + if ($this->surveyvotes->removeElement($surveyvote)) { // set the owning side to null (unless already changed) - if ($vote->getGuest() === $this) { - $vote->setGuest(null); + if ($surveyvote->getSurveyguest() === $this) { + $surveyvote->setSurveyguest(null); } } return $this; } - + } diff --git a/src/ninesurvey-1.0/src/Entity/Option.php b/src/ninesurvey-1.0/src/Entity/Surveyoption.php similarity index 62% rename from src/ninesurvey-1.0/src/Entity/Option.php rename to src/ninesurvey-1.0/src/Entity/Surveyoption.php index 43f7cb0..755c5cc 100644 --- a/src/ninesurvey-1.0/src/Entity/Option.php +++ b/src/ninesurvey-1.0/src/Entity/Surveyoption.php @@ -2,16 +2,15 @@ namespace App\Entity; -use App\Repository\OptionRepository; +use App\Repository\SurveyoptionRepository; use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; use Doctrine\ORM\Mapping as ORM; /** - * @ORM\Entity(repositoryClass=OptionRepository::class) - * @ORM\Table(name="`option`") + * @ORM\Entity(repositoryClass=SurveyoptionRepository::class) */ -class Option +class Surveyoption { /** * @ORM\Id() @@ -31,18 +30,18 @@ class Option private $choiced; /** - * @ORM\OneToMany(targetEntity="App\Entity\Vote", mappedBy="option", cascade={"persist"}, orphanRemoval=true) + * @ORM\OneToMany(targetEntity="App\Entity\Surveyvote", mappedBy="surveyoption", cascade={"persist"}, orphanRemoval=true) */ - private $votes; + private $surveyvotes; /** - * @ORM\ManyToOne(targetEntity="App\Entity\Survey", inversedBy="options") + * @ORM\ManyToOne(targetEntity="App\Entity\Survey", inversedBy="surveyoptions") */ private $survey; public function __construct() { - $this->votes = new ArrayCollection(); + $this->surveyvotes = new ArrayCollection(); } public function getId(): ?int @@ -75,29 +74,29 @@ class Option } /** - * @return Collection|Vote[] + * @return Collection|Surveyvote[] */ - public function getVotes(): Collection + public function getSurveyvotes(): Collection { - return $this->votes; + return $this->surveyvotes; } - public function addVote(Vote $vote): self + public function addSurveyvote(Surveyvote $surveyvote): self { - if (!$this->votes->contains($vote)) { - $this->votes[] = $vote; - $vote->setOption($this); + if (!$this->surveyvotes->contains($surveyvote)) { + $this->surveyvotes[] = $surveyvote; + $surveyvote->setOption($this); } return $this; } - public function removeVote(Vote $vote): self + public function removeSurveyvote(Surveyvote $surveyvote): self { - if ($this->votes->removeElement($vote)) { + if ($this->surveyvotes->removeElement($surveyvote)) { // set the owning side to null (unless already changed) - if ($vote->getOption() === $this) { - $vote->setOption(null); + if ($surveyvote->getOption() === $this) { + $surveyvote->setOption(null); } } diff --git a/src/ninesurvey-1.0/src/Entity/Surveyvote.php b/src/ninesurvey-1.0/src/Entity/Surveyvote.php new file mode 100644 index 0000000..52f4bb5 --- /dev/null +++ b/src/ninesurvey-1.0/src/Entity/Surveyvote.php @@ -0,0 +1,78 @@ +id; + } + + public function getVote(): ?int + { + return $this->vote; + } + + public function setVote(?int $vote): self + { + $this->vote = $vote; + + return $this; + } + + public function getSurveyguest(): ?Surveyguest + { + return $this->surveyguest; + } + + public function setSurveyguest(?Surveyguest $surveyguest): self + { + $this->surveyguest = $surveyguest; + + return $this; + } + + public function getSurveyoption(): ?Surveyoption + { + return $this->surveyoption; + } + + public function setSurveyoption(?Surveyoption $surveyoption): self + { + $this->surveyoption = $surveyoption; + + return $this; + } + + + +} diff --git a/src/ninesurvey-1.0/src/Entity/User.php b/src/ninesurvey-1.0/src/Entity/User.php index 3ad38e5..502c659 100644 --- a/src/ninesurvey-1.0/src/Entity/User.php +++ b/src/ninesurvey-1.0/src/Entity/User.php @@ -97,12 +97,12 @@ class User implements UserInterface, \Serializable private $surveys; /** - * @var \App\Entity\Guest + * @var \App\Entity\Surveyguest * - * @ORM\OneToMany(targetEntity="App\Entity\Guest", mappedBy="user") + * @ORM\OneToMany(targetEntity="App\Entity\Surveyguest", mappedBy="user") * @ORM\JoinColumn(nullable=true, onDelete="SET NULL") */ - private $guests; + private $surveyguests; /** * @var \App\Entity\Quest @@ -123,7 +123,7 @@ class User implements UserInterface, \Serializable { $this->groups = new ArrayCollection(); $this->surveys = new ArrayCollection(); - $this->guests = new ArrayCollection(); + $this->surveyguests = new ArrayCollection(); $this->quests = new ArrayCollection(); $this->questguests = new ArrayCollection(); } @@ -350,29 +350,29 @@ class User implements UserInterface, \Serializable } /** - * @return Collection|Guest[] + * @return Collection|Surveyguest[] */ - public function getGuests(): Collection + public function getSurveyguests(): Collection { - return $this->guests; + return $this->surveyguests; } - public function addGuest(Guest $guest): self + public function addGuest(Surveyguest $surveyguest): self { - if (!$this->guests->contains($guest)) { - $this->guests[] = $guest; - $guest->setUser($this); + if (!$this->surveyguests->contains($surveyguest)) { + $this->surveyguests[] = $surveyguest; + $surveyguest->setUser($this); } return $this; } - public function removeGuest(Guest $guest): self + public function removeGuest(Surveyguest $surveyguest): self { - if ($this->guests->removeElement($guest)) { + if ($this->surveyguests->removeElement($surveyguest)) { // set the owning side to null (unless already changed) - if ($guest->getUser() === $this) { - $guest->setUser(null); + if ($surveyguest->getUser() === $this) { + $surveyguest->setUser(null); } } @@ -439,4 +439,26 @@ class User implements UserInterface, \Serializable return $this; } + public function addSurveyguest(Surveyguest $surveyguest): self + { + if (!$this->surveyguests->contains($surveyguest)) { + $this->surveyguests[] = $surveyguest; + $surveyguest->setUser($this); + } + + return $this; + } + + public function removeSurveyguest(Surveyguest $surveyguest): self + { + if ($this->surveyguests->removeElement($surveyguest)) { + // set the owning side to null (unless already changed) + if ($surveyguest->getUser() === $this) { + $surveyguest->setUser(null); + } + } + + return $this; + } + } diff --git a/src/ninesurvey-1.0/src/Entity/Vote.php b/src/ninesurvey-1.0/src/Entity/Vote.php deleted file mode 100644 index 7f20c39..0000000 --- a/src/ninesurvey-1.0/src/Entity/Vote.php +++ /dev/null @@ -1,77 +0,0 @@ -id; - } - - public function getGuest(): ?Guest - { - return $this->guest; - } - - public function setGuest(?Guest $guest): self - { - $this->guest = $guest; - - return $this; - } - - public function getOption(): ?Option - { - return $this->option; - } - - public function setOption(?Option $option): self - { - $this->option = $option; - - return $this; - } - - public function getVote(): ?int - { - return $this->vote; - } - - public function setVote(?int $vote): self - { - $this->vote = $vote; - - return $this; - } - - -} diff --git a/src/ninesurvey-1.0/src/Form/QuestheaderType.php b/src/ninesurvey-1.0/src/Form/QuestheaderType.php index 5e9abbc..52cee5a 100644 --- a/src/ninesurvey-1.0/src/Form/QuestheaderType.php +++ b/src/ninesurvey-1.0/src/Form/QuestheaderType.php @@ -42,6 +42,10 @@ class QuestheaderType extends AbstractType 'label' => 'Notifications', 'required' => false, ]); + $builder->add('key', HiddenType::class, [ + 'label' => 'key', + 'required' => true, + ]); break; case 2: diff --git a/src/ninesurvey-1.0/src/Form/QuestkeyType.php b/src/ninesurvey-1.0/src/Form/QuestkeyType.php new file mode 100644 index 0000000..312d6a3 --- /dev/null +++ b/src/ninesurvey-1.0/src/Form/QuestkeyType.php @@ -0,0 +1,45 @@ +add('submit', + SubmitType::class, [ + "label" => "Voter", + "attr" => ["class" => "btn btn-success no-print"], + ] + ); + + $builder->add('email', + EmailType::class, [ + "label" =>"Email", + ] + ); + + $builder->add('displayname', + TextType::class, [ + "label" =>"Nom Prénom", + "attr" => ["autocomplete" => "off"], + ] + ); + + } + + public function configureOptions(OptionsResolver $resolver) + { + $resolver->setDefaults([ + 'data_class' => 'App\Entity\Questguest', + ]); + } +} diff --git a/src/ninesurvey-1.0/src/Form/QueststatusType.php b/src/ninesurvey-1.0/src/Form/QueststatusType.php new file mode 100644 index 0000000..1f6cca7 --- /dev/null +++ b/src/ninesurvey-1.0/src/Form/QueststatusType.php @@ -0,0 +1,46 @@ +add('submit', + SubmitType::class, [ + "label" => ($options["status"]==1?"Envoyer le résultat et clôturer":"Réouvrir le sondage"), + "attr" => ["class" => "btn btn-danger no-print"], + ] + ); + + $builder->add('tonotifymessage', + CKEditorType::class, [ + "label" => "Message envoyé", + "required" => true, + "config" => [ + 'uiColor' => '#ffffff', + 'height' => 250, + 'filebrowserUploadRoute' => 'app_ckeditor_upload', + 'language' => 'fr', + ], + ] + ); + } + + public function configureOptions(OptionsResolver $resolver) + { + $resolver->setDefaults([ + 'data_class' => 'App\Entity\Quest', + 'status' => 'string' + ]); + } +} diff --git a/src/ninesurvey-1.0/src/Form/GuestType.php b/src/ninesurvey-1.0/src/Form/SurveyguestType.php similarity index 83% rename from src/ninesurvey-1.0/src/Form/GuestType.php rename to src/ninesurvey-1.0/src/Form/SurveyguestType.php index d3eab1d..2bea783 100644 --- a/src/ninesurvey-1.0/src/Form/GuestType.php +++ b/src/ninesurvey-1.0/src/Form/SurveyguestType.php @@ -8,13 +8,13 @@ use Symfony\Component\Form\Extension\Core\Type\HiddenType; use Symfony\Component\Form\Extension\Core\Type\SubmitType; -class GuestType extends AbstractType +class SurveyguestType extends AbstractType { public function buildForm(FormBuilderInterface $builder, array $options) { - $builder->add('jsonvotes', + $builder->add('jsonsurveyvotes', HiddenType::class, [ - 'label' => 'jsonvotes', + 'label' => 'jsonsurveyvotes', 'required' => false, 'empty_data' => '', ] @@ -33,7 +33,7 @@ class GuestType extends AbstractType public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults(array( - 'data_class' => 'App\Entity\Guest', + 'data_class' => 'App\Entity\Surveyguest', 'status' => 'string', )); } diff --git a/src/ninesurvey-1.0/src/Form/SurveyguestsType.php b/src/ninesurvey-1.0/src/Form/SurveyguestsType.php index 1b8e8a0..b35a57f 100644 --- a/src/ninesurvey-1.0/src/Form/SurveyguestsType.php +++ b/src/ninesurvey-1.0/src/Form/SurveyguestsType.php @@ -14,14 +14,14 @@ class SurveyguestsType extends AbstractType public function buildForm(FormBuilderInterface $builder, array $options) { $builder - ->add('jsonguests', HiddenType::class, [ - 'label' => 'jsonguests', + ->add('jsonsurveyguests', HiddenType::class, [ + 'label' => 'jsonsurveyguests', 'required' => false, 'empty_data' => '', ]) - ->add('jsonguests', HiddenType::class, [ - 'label' => 'jsonguests', + ->add('jsonsurveyguests', HiddenType::class, [ + 'label' => 'jsonsurveyguests', 'required' => false, 'empty_data' => '', ]) diff --git a/src/ninesurvey-1.0/src/Form/SurveyheaderType.php b/src/ninesurvey-1.0/src/Form/SurveyheaderType.php index f0920d6..bfddac3 100644 --- a/src/ninesurvey-1.0/src/Form/SurveyheaderType.php +++ b/src/ninesurvey-1.0/src/Form/SurveyheaderType.php @@ -38,31 +38,35 @@ class SurveyheaderType extends AbstractType 'label' => 'Notifications', 'required' => false, ]); + $builder->add('key', HiddenType::class, [ + 'label' => 'key', + 'required' => true, + ]); break; case 2: - $builder->add('jsonoptions', CollectionType::class, [ + $builder->add('jsonsurveyoptions', CollectionType::class, [ 'entry_type' => SurveyoptionsType::class, 'entry_options' => ['label' => true], ]); break; case 3: - $builder->add('jsonguests', CollectionType::class, [ + $builder->add('jsonsurveyguests', CollectionType::class, [ 'entry_type' => SurveyguestsType::class, 'entry_options' => ['label' => true], ]); break; case 4: - $builder->add('jsonoptions', HiddenType::class, [ - 'label' => 'jsonoptions', + $builder->add('jsonsurveyoptions', HiddenType::class, [ + 'label' => 'jsonsurveyoptions', 'required' => false, 'empty_data' => '', ]); - $builder->add('jsonguests', HiddenType::class, [ - 'label' => 'jsonguests', + $builder->add('jsonsurveyguests', HiddenType::class, [ + 'label' => 'jsonsurveyguests', 'required' => false, 'empty_data' => '', ]); diff --git a/src/ninesurvey-1.0/src/Form/SurveykeyType.php b/src/ninesurvey-1.0/src/Form/SurveykeyType.php index af797d1..966ba22 100644 --- a/src/ninesurvey-1.0/src/Form/SurveykeyType.php +++ b/src/ninesurvey-1.0/src/Form/SurveykeyType.php @@ -39,7 +39,7 @@ class SurveykeyType extends AbstractType public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults([ - 'data_class' => 'App\Entity\Guest', + 'data_class' => 'App\Entity\Surveyguest', ]); } } diff --git a/src/ninesurvey-1.0/src/Form/SurveyoptionsType.php b/src/ninesurvey-1.0/src/Form/SurveyoptionsType.php index 2747ffb..08aa3e9 100644 --- a/src/ninesurvey-1.0/src/Form/SurveyoptionsType.php +++ b/src/ninesurvey-1.0/src/Form/SurveyoptionsType.php @@ -12,8 +12,8 @@ class SurveyoptionsType extends AbstractType public function buildForm(FormBuilderInterface $builder, array $options) { $builder - ->add('jsonoptions', HiddenType::class, [ - 'label' => 'jsonoptions', + ->add('jsonsurveyoptions', HiddenType::class, [ + 'label' => 'jsonsurveyoptions', 'required' => false, 'empty_data' => '', ]) diff --git a/src/ninesurvey-1.0/src/Repository/GuestRepository.php b/src/ninesurvey-1.0/src/Repository/SurveyguestRepository.php similarity index 60% rename from src/ninesurvey-1.0/src/Repository/GuestRepository.php rename to src/ninesurvey-1.0/src/Repository/SurveyguestRepository.php index 26e5659..c6e62ff 100644 --- a/src/ninesurvey-1.0/src/Repository/GuestRepository.php +++ b/src/ninesurvey-1.0/src/Repository/SurveyguestRepository.php @@ -2,14 +2,14 @@ namespace App\Repository; -use App\Entity\Guest; +use App\Entity\Surveyguest; use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository; use Doctrine\Common\Persistence\ManagerRegistry; -class GuestRepository extends ServiceEntityRepository +class SurveyguestRepository extends ServiceEntityRepository { public function __construct(ManagerRegistry $registry) { - parent::__construct($registry, Guest::class); + parent::__construct($registry, Surveyguest::class); } } diff --git a/src/ninesurvey-1.0/src/Repository/OptionRepository.php b/src/ninesurvey-1.0/src/Repository/SurveyoptionRepository.php similarity index 60% rename from src/ninesurvey-1.0/src/Repository/OptionRepository.php rename to src/ninesurvey-1.0/src/Repository/SurveyoptionRepository.php index 9815f5f..8b0986c 100644 --- a/src/ninesurvey-1.0/src/Repository/OptionRepository.php +++ b/src/ninesurvey-1.0/src/Repository/SurveyoptionRepository.php @@ -2,14 +2,14 @@ namespace App\Repository; -use App\Entity\Option; +use App\Entity\Surveyoption; use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository; use Doctrine\Common\Persistence\ManagerRegistry; -class OptionRepository extends ServiceEntityRepository +class SurveyoptionRepository extends ServiceEntityRepository { public function __construct(ManagerRegistry $registry) { - parent::__construct($registry, Option::class); + parent::__construct($registry, Surveyoption::class); } } diff --git a/src/ninesurvey-1.0/src/Repository/VoteRepository.php b/src/ninesurvey-1.0/src/Repository/SurveyvoteRepository.php similarity index 61% rename from src/ninesurvey-1.0/src/Repository/VoteRepository.php rename to src/ninesurvey-1.0/src/Repository/SurveyvoteRepository.php index 9969565..69c932c 100644 --- a/src/ninesurvey-1.0/src/Repository/VoteRepository.php +++ b/src/ninesurvey-1.0/src/Repository/SurveyvoteRepository.php @@ -2,14 +2,14 @@ namespace App\Repository; -use App\Entity\Vote; +use App\Entity\Surveyvote; use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository; use Doctrine\Common\Persistence\ManagerRegistry; -class VoteRepository extends ServiceEntityRepository +class SurveyvoteRepository extends ServiceEntityRepository { public function __construct(ManagerRegistry $registry) { - parent::__construct($registry, Vote::class); + parent::__construct($registry, Surveyvote::class); } } diff --git a/src/ninesurvey-1.0/templates/Quest/byquestkey.html.twig b/src/ninesurvey-1.0/templates/Quest/byquestkey.html.twig index b4fb57e..e23bcc1 100644 --- a/src/ninesurvey-1.0/templates/Quest/byquestkey.html.twig +++ b/src/ninesurvey-1.0/templates/Quest/byquestkey.html.twig @@ -36,7 +36,7 @@ h2.centre-line span { {{ form_start(form) }}

Ninesurvey

- {{ survey.title }} + {{ quest.title }}

@@ -58,11 +58,11 @@ h2.centre-line span {
{% endif %} - Avant de pouvoir répondre au sondage.
+ Avant de pouvoir répondre au questionnaire.
Merci

d'utiliser votre compte
- Connexion + Connexion

OU

diff --git a/src/ninesurvey-1.0/templates/Quest/edit.html.twig b/src/ninesurvey-1.0/templates/Quest/edit.html.twig index 6c3b75d..8968fab 100644 --- a/src/ninesurvey-1.0/templates/Quest/edit.html.twig +++ b/src/ninesurvey-1.0/templates/Quest/edit.html.twig @@ -335,7 +335,7 @@ $(document).ready(function() { var stepper = new Stepper($('.bs-stepper')[0]); - html='Annuler'; + html='Annuler'; $(".craue_formflow_buttons").prepend(html); }); diff --git a/src/ninesurvey-1.0/templates/Quest/result.html.twig b/src/ninesurvey-1.0/templates/Quest/result.html.twig index 519267f..9f77155 100644 --- a/src/ninesurvey-1.0/templates/Quest/result.html.twig +++ b/src/ninesurvey-1.0/templates/Quest/result.html.twig @@ -45,7 +45,7 @@ {% if not type is defined or type !="pdf" %} Retour Exporter en CSV - Exporter en PDF + Exporter en PDF {% endif %}

Synthèse

Titre de l'enquête = {{ quest.title }}
diff --git a/src/ninesurvey-1.0/templates/Response/questvote.html.twig b/src/ninesurvey-1.0/templates/Response/questvote.html.twig index 96bf8d4..ee44653 100644 --- a/src/ninesurvey-1.0/templates/Response/questvote.html.twig +++ b/src/ninesurvey-1.0/templates/Response/questvote.html.twig @@ -30,6 +30,11 @@ {% endif %} {% for option in questguest.quest.questoptions %} + {%set disabled="" %} + {% if form.submit is not defined %} + {%set disabled="disabled='disabled'" %} + {% endif %} +
{% if option.type == "10" %} - @@ -49,7 +54,7 @@ {% endif %} {% if option.type == "20" %} - @@ -58,7 +63,7 @@ {% endif %} {% if option.type == "30" %} - @@ -67,7 +72,7 @@ {% endif %} {% if option.type == "40" %} - @@ -78,7 +83,7 @@ {% if option.type == "50" %} - @@ -90,29 +95,29 @@ {% if option.type == "60" %}
note sur 5 - + {% endif %} {% if option.type == "70" %}
note sur 10 - + {% endif %} {% if option.type == "80" %}
note sur 20 - + {% endif %} {% if option.type == "90" %} - + {% endif %} {% if option.type == "100" %} - + {% endif %} {% if option.type == "110" %} - {% for parameter in option.parameters %} @@ -123,7 +128,9 @@
{% endfor %} - {{ form_widget(form.submit) }} + {% if form.submit is defined %} + {{ form_widget(form.submit) }} + {%endif%} {{ form_end(form) }} {% endblock %} diff --git a/src/ninesurvey-1.0/templates/Response/vote.html.twig b/src/ninesurvey-1.0/templates/Response/surveyvote.html.twig similarity index 55% rename from src/ninesurvey-1.0/templates/Response/vote.html.twig rename to src/ninesurvey-1.0/templates/Response/surveyvote.html.twig index 998f1fe..45f0b51 100644 --- a/src/ninesurvey-1.0/templates/Response/vote.html.twig +++ b/src/ninesurvey-1.0/templates/Response/surveyvote.html.twig @@ -17,7 +17,7 @@ background-color: #aaa; color: #fff; } - .guest { + .surveyguest { text-align:left; min-width:300px; } @@ -36,7 +36,7 @@ .time { font-size:150% } - .vote { + .surveyvote { background-color: transparent; border: none; width: 90px; @@ -60,7 +60,7 @@ height:70px; width:70px; } - .choice .choiceoption { + .choice .choicesurveyoption { width: 30px; height: 35px; display: inline-block; @@ -68,7 +68,7 @@ cursor: pointer; } - .choiceoption.active { + .choicesurveyoption.active { background-color:#eee; border-radius:100% } @@ -82,11 +82,11 @@ {% block body %} {{ form_start(form) }}
-

{{guest.survey.title}}

+

{{surveyguest.survey.title}}

{% if by=="byuserkey" %} Retour {% endif %} - {{ guest.survey.description|raw }} + {{ surveyguest.survey.description|raw }} {% if app.session.flashbag.has('error') %}
@@ -109,13 +109,13 @@
{% if form.submit is defined %} - {% set result=guest.survey.result %} + {% set result=surveyguest.survey.result %} {% if not result is empty %} Résultat temporaire
- {% for option in result|slice(0, 2) %} - {{ option.date|date("d/m/Y H:i")}}
+ {% for surveyoption in result|slice(0, 2) %} + {{ surveyoption.date|date("d/m/Y H:i")}}
{%endfor%}
@@ -123,9 +123,9 @@ {% endif %} {% else %} {% set choiced = "" %} - {% for option in guest.survey.options %} - {% if option.choiced %} - {% set choiced = option.date %} + {% for surveyoption in surveyguest.survey.surveyoptions %} + {% if surveyoption.choiced %} + {% set choiced = surveyoption.date %} {% endif %} {% endfor %} @@ -143,72 +143,72 @@ - - - {% set totoptions=guest.survey.options|length %} + + + {% set totsurveyoptions=surveyguest.survey.surveyoptions|length %} - {% for option in guest.survey.options %} + {% for surveyoption in surveyguest.survey.surveyoptions %} {% endfor %} - + - - - + + - {% for option in guest.survey.options %} - {% endfor %} - + - + - {% for other in guest.survey.guests %} - {% if other!=guest %} + {% for other in surveyguest.survey.surveyguests %} + {% if other!=surveyguest %} - - + - {% if other.votes is empty %} - + {% if other.surveyvotes is empty %} + {% else %} - {% for option in guest.survey.options %} - {% for vote in other.votes %} - {%if vote.option.id==option.id %} + {% for surveyoption in surveyguest.survey.surveyoptions %} + {% for surveyvote in other.surveyvotes %} + {%if surveyvote.surveyoption.id==surveyoption.id %} + {% endif %} {% endfor %} @@ -233,27 +233,27 @@ {% block localjavascript %} $(document).ready(function() { - if ($("#guest_jsonvotes").val() == ''||$("#guest_jsonvotes").val()=='[]'){ + if ($("#surveyguest_jsonsurveyvotes").val() == ''||$("#surveyguest_jsonsurveyvotes").val()=='[]'){ $(".response.none").addClass("active"); - $(".choiceoption.none").addClass("active"); + $(".choicesurveyoption.none").addClass("active"); } - var votes = JSON.parse($("#guest_jsonvotes").val()); + var surveyvotes = JSON.parse($("#surveyguest_jsonsurveyvotes").val()); - $.each(votes, function(i, vote) { - console.log(vote.id+" "+vote.val); + $.each(surveyvotes, function(i, surveyvote) { + console.log(surveyvote.id+" "+surveyvote.val); // Ajout de la l'attribut active var toactive; - switch(vote.val) { + switch(surveyvote.val) { case "": toactive="none"; break; case 0: case "0": toactive="ko"; break; case 1: case "1": toactive="maybe"; break; case 2: case "2": toactive="ok"; break; } - $("#input-"+vote.id).val(vote.val); - $("#div-"+vote.id).children("."+toactive).addClass("active"); - $("#choice-"+vote.id).children(".choiceoption."+toactive).addClass("active"); + $("#input-"+surveyvote.id).val(surveyvote.val); + $("#div-"+surveyvote.id).children("."+toactive).addClass("active"); + $("#choice-"+surveyvote.id).children(".choicesurveyoption."+toactive).addClass("active"); }); $(".active").show(); }); @@ -268,27 +268,27 @@ $(".response").mouseover(function() { }); -$("#row-guest").mouseleave(function() { +$("#row-surveyguest").mouseleave(function() { $(".choice").hide(); $(".active").show(); }); -$("#row-guest .guest").mouseover(function() { +$("#row-surveyguest .surveyguest").mouseover(function() { $(".choice").hide(); $(".active").show(); }); -$("#guest_submit").mouseover(function() { +$("#surveyguest_submit").mouseover(function() { $(".choice").hide(); $(".active").show(); }); -function voteChoice(choice,id) { +function surveyvoteChoice(choice,id) { $("#input-"+id).val(choice); // Suppression de l'attribut active $("#div-"+id).children(".response").removeClass("active"); - $("#choice-"+id).children(".choiceoption").removeClass("active"); + $("#choice-"+id).children(".choicesurveyoption").removeClass("active"); // Ajout de la l'attribut active var toactive; @@ -299,31 +299,31 @@ function voteChoice(choice,id) { case 2: toactive="ok"; break; } $("#div-"+id).children("."+toactive).addClass("active"); - $("#choice-"+id).children(".choiceoption."+toactive).addClass("active"); + $("#choice-"+id).children(".choicesurveyoption."+toactive).addClass("active"); } -$('#mycontent').on('click', '#guest_submit', function(event) { - // Construction du tableau des votes - var tbvotes=[]; +$('#mycontent').on('click', '#surveyguest_submit', function(event) { + // Construction du tableau des surveyvotes + var tbsurveyvotes=[]; $(".input-response").each(function() { - keyvote=$(this).attr("id").replace("input-",""); - valvote=$(this).val(); - tbvotes[keyvote]=valvote; + keysurveyvote=$(this).attr("id").replace("input-",""); + valsurveyvote=$(this).val(); + tbsurveyvotes[keysurveyvote]=valsurveyvote; }); // On recalcul la chaine json - votes=""; - for (const [keyvote, valvote] of Object.entries(tbvotes)) { - if(votes!="") votes+=','; - if(votes=="") votes='['; - votes+='{ "id":"'+keyvote+'", "val":"'+valvote+'"}'; + surveyvotes=""; + for (const [keysurveyvote, valsurveyvote] of Object.entries(tbsurveyvotes)) { + if(surveyvotes!="") surveyvotes+=','; + if(surveyvotes=="") surveyvotes='['; + surveyvotes+='{ "id":"'+keysurveyvote+'", "val":"'+valsurveyvote+'"}'; } - if(votes!="") votes+=']'; - if(votes=="") votes="[]"; + if(surveyvotes!="") surveyvotes+=']'; + if(surveyvotes=="") surveyvotes="[]"; // Valoriser le formulaire - $("#guest_jsonvotes").val(votes); + $("#surveyguest_jsonsurveyvotes").val(surveyvotes); }); {%endif%} {% endblock %} diff --git a/src/ninesurvey-1.0/templates/Survey/edit.html.twig b/src/ninesurvey-1.0/templates/Survey/edit.html.twig index 0074b29..528d4fc 100644 --- a/src/ninesurvey-1.0/templates/Survey/edit.html.twig +++ b/src/ninesurvey-1.0/templates/Survey/edit.html.twig @@ -206,13 +206,13 @@ {% if flow.getCurrentStepNumber() == 2 %} - {{ form_row(form.jsonoptions) }} + {{ form_row(form.jsonsurveyoptions) }}
{% endif %} {% if flow.getCurrentStepNumber() == 3 %} - {{ form_row(form.jsonguests) }} + {{ form_row(form.jsonsurveyguests) }} {% if not survey.private %}
@@ -267,8 +267,8 @@ {% if flow.getCurrentStepNumber() == 4 %} - {{ form_row(form.jsonoptions) }} - {{ form_row(form.jsonguests) }} + {{ form_row(form.jsonsurveyoptions) }} + {{ form_row(form.jsonsurveyguests) }}
{% if id is defined %} @@ -331,7 +331,7 @@ $(document).ready(function() { var stepper = new Stepper($('.bs-stepper')[0]); - html='Annuler'; + html='Annuler'; $(".craue_formflow_buttons").prepend(html); }); @@ -350,11 +350,11 @@ var timeoptions = { $(document).ready(function() { - if ($("#surveyoptions_jsonoptions").val() == ''||$("#surveyoptions_jsonoptions").val()=='[]'){ - $("#surveyoptions_jsonoptions").val('[{"date":"" , "hours":["",""] }, { "date":"" , "hours":["",""] } ]'); + if ($("#surveyoptions_jsonsurveyoptions").val() == ''||$("#surveyoptions_jsonsurveyoptions").val()=='[]'){ + $("#surveyoptions_jsonsurveyoptions").val('[{"date":"" , "hours":["",""] }, { "date":"" , "hours":["",""] } ]'); } - var obj = JSON.parse($("#surveyoptions_jsonoptions").val()); + var obj = JSON.parse($("#surveyoptions_jsonsurveyoptions").val()); console.log(obj); initDates(obj); @@ -541,7 +541,7 @@ $('#mycontent').on('click', '.btnnextstep', function(event) { }) // Valoriser le formulaire - $("#surveyoptions_jsonoptions").val(JSON.stringify(ordered)); + $("#surveyoptions_jsonsurveyoptions").val(JSON.stringify(ordered)); }); {% endif %} @@ -554,7 +554,7 @@ $(document).ready(function() { if ("{{ survey.private }}"=="1"){ $("#gueststools").show(); - var tbmails = JSON.parse($("#surveyguests_jsonguests").val()); + var tbmails = JSON.parse($("#surveyguests_jsonsurveyguests").val()); var toshow=false; tbmails.forEach(function(mail) { addGuest(mail); @@ -648,7 +648,7 @@ $('#mycontent').on('click', '.btnnextstep', function(event) { tbmails.sort(); // Valoriser le formulaire - $("#surveyguests_jsonguests").val(JSON.stringify(tbmails)); + $("#surveyguests_jsonsurveyguests").val(JSON.stringify(tbmails)); {% endif %} }); @@ -659,7 +659,7 @@ $('#mycontent').on('click', '.btnnextstep', function(event) { {% if flow.getCurrentStepNumber() == 4 %} $(document).ready(function() { - var tbdates = JSON.parse($("#createSurvey_jsonoptions").val()); + var tbdates = JSON.parse($("#createSurvey_jsonsurveyoptions").val()); tbdates.forEach(function(date,indexdate) { date.hours.forEach(function(hour,indexhour) { addRecapOption(date.date, hour,indexdate, indexhour); @@ -667,7 +667,7 @@ $(document).ready(function() { }); if ("{{ survey.private }}"=="1"){ - var tbmails = JSON.parse($("#createSurvey_jsonguests").val()); + var tbmails = JSON.parse($("#createSurvey_jsonsurveyguests").val()); tbmails.forEach(function(mail,index) { addRecapGuest(mail,index); }); diff --git a/src/ninesurvey-1.0/templates/Survey/survey.html.twig b/src/ninesurvey-1.0/templates/Survey/survey.html.twig index 9ada177..e0fd1b3 100755 --- a/src/ninesurvey-1.0/templates/Survey/survey.html.twig +++ b/src/ninesurvey-1.0/templates/Survey/survey.html.twig @@ -46,27 +46,27 @@
- {% for guest in guests %} + {% for surveyguest in surveyguests %}
- {{ guest.survey.title }} + {{ surveyguest.survey.title }}
- {% if guest.survey.status==0 %} Répondre{%else%} Visualiser{%endif%} - {% if app.user==guest.survey.user %} - Modifier - + {% if surveyguest.survey.status==0 %} Répondre{%else%} Visualiser{%endif%} + {% if app.user==surveyguest.survey.user %} + Modifier + {% endif %}
- {% set result=guest.survey.result %} + {% set result=surveyguest.survey.result %} {% if not result is empty %} Résultat
- {% for option in result|slice(0, 2) %} - - {{ option.date|date("d/m/Y H:i")}}
+ {% for surveyoption in result|slice(0, 2) %} + - {{ surveyoption.date|date("d/m/Y H:i")}}
{%endfor%}
@@ -76,8 +76,8 @@ Options
- {% for option in guest.survey.options %} - - {{ option.date|date("d/m/Y H:i")}}
+ {% for surveyoption in surveyguest.survey.surveyoptions %} + - {{ surveyoption.date|date("d/m/Y H:i")}}
{% endfor %}
@@ -86,7 +86,7 @@ Suppression le
- - {{ guest.survey.datepurge|date("d/m/Y")}}
+ - {{ surveyguest.survey.datepurge|date("d/m/Y")}}
@@ -95,16 +95,16 @@ Propriétaire
- - {{guest.survey.user.displayname}}
+ - {{surveyguest.survey.user.displayname}}

- {% if app.user==guest.survey.user and not guest.survey.private %} - URL à transmettre par mail
+ {% if app.user==surveyguest.survey.user and not surveyguest.survey.private %} + URL à transmettre par mail
-
- {{ url('app_survey_bysurveykey',{'key':guest.survey.key})}} +
+ {{ url('app_survey_bysurveykey',{'key':surveyguest.survey.key})}}

@@ -113,28 +113,28 @@ Invités
- {% if not guest.survey.private %} + {% if not surveyguest.survey.private %} Sondage Public
{% else %} Sondage Privé
{% endif %} - {% for otherguest in guest.survey.guests %} - {% set colorguest="" %} - {% if otherguest.votes is empty %} - {% set colorguest="color:red" %} + {% for othersurveyguest in surveyguest.survey.surveyguests %} + {% set colorsurveyguest="" %} + {% if othersurveyguest.surveyvotes is empty %} + {% set colorsurveyguest="color:red" %} {% endif %} - - {{ otherguest.email}}
+ - {{ othersurveyguest.email}}
{% endfor %}
- {% if app.user==guest.survey.user %} - {% if guest.survey.status==0 %} - Envoyer le résultat et clôturer + {% if app.user==surveyguest.survey.user %} + {% if surveyguest.survey.status==0 %} + Envoyer le résultat et clôturer {% else %} - Réouvrir le sondage + Réouvrir le sondage {% endif %} {% endif %}
InvitésInvités -
{{ option.date|format_datetime(pattern="eeee",locale='fr') }}
-
{{ option.date|date("d") }}
-
{{ option.date|format_datetime(pattern="LLLL",locale='fr') }} -
{{ option.date|format_datetime(pattern="kk:ss",locale='fr') }} +
{{ surveyoption.date|format_datetime(pattern="eeee",locale='fr') }}
+
{{ surveyoption.date|date("d") }}
+
{{ surveyoption.date|format_datetime(pattern="LLLL",locale='fr') }} +
{{ surveyoption.date|format_datetime(pattern="kk:ss",locale='fr') }}
- {{guest.displayname}} - {% if guest.displayname!=guest.email %}
{{guest.email}}
{%endif%} +
+ {{surveyguest.displayname}} + {% if surveyguest.displayname!=surveyguest.email %}
{{surveyguest.email}}
{%endif%}
- + {% for surveyoption in surveyguest.survey.surveyoptions %} + + - {% if form.submit is defined %}{{ form_widget(form.submit) }}{%endif%}{% if form.submit is defined %}{{ form_widget(form.submit) }}{%endif%}
+ {{other.displayname}} {% if other.displayname!=other.email %}
{{other.email}}
{%endif%}
Non réponduNon répondu - {% if vote.vote is empty %} + {% if surveyvote.vote is empty %}
- {% elseif vote.vote==0 %} + {% elseif surveyvote.vote==0 %}
- {% elseif vote.vote==1 %} + {% elseif surveyvote.vote==1 %}
{% else %}
@@ -220,7 +220,7 @@ {% endfor %} {% endfor %} {% endif %} -