From 42a5c7ccdb0cf2012e7130f6555634c5d92c91f3 Mon Sep 17 00:00:00 2001 From: Arnaud Fornerot Date: Mon, 7 Feb 2022 15:19:23 +0100 Subject: [PATCH] svg --- src/ninesurvey-1.0/config/routes.yaml | 2 +- .../skins/moono-lisa/images/close.png | Bin 615 -> 615 bytes .../skins/moono-lisa/images/hidpi/close.png | Bin 1259 -> 1259 bytes .../balloonpanel/skins/moono/images/close.png | Bin 824 -> 824 bytes .../ckeditor/plugins/bidi/icons/bidiltr.png | Bin 471 -> 471 bytes .../ckeditor/plugins/bidi/icons/bidirtl.png | Bin 474 -> 474 bytes .../plugins/bidi/icons/hidpi/bidiltr.png | Bin 872 -> 872 bytes .../plugins/bidi/icons/hidpi/bidirtl.png | Bin 945 -> 945 bytes .../plugins/codesnippet/icons/codesnippet.png | Bin 532 -> 532 bytes .../codesnippet/icons/hidpi/codesnippet.png | Bin 1046 -> 1046 bytes .../plugins/colorbutton/icons/bgcolor.png | Bin 616 -> 616 bytes .../colorbutton/icons/hidpi/bgcolor.png | Bin 1249 -> 1249 bytes .../colorbutton/icons/hidpi/textcolor.png | Bin 1312 -> 1312 bytes .../plugins/colorbutton/icons/textcolor.png | Bin 757 -> 757 bytes .../copyformatting/icons/copyformatting.png | Bin 707 -> 707 bytes .../icons/hidpi/copyformatting.png | Bin 1245 -> 1245 bytes .../ckeditor/plugins/div/icons/creatediv.png | Bin 569 -> 569 bytes .../plugins/div/icons/hidpi/creatediv.png | Bin 1678 -> 1678 bytes .../plugins/docprops/icons/docprops-rtl.png | Bin 543 -> 543 bytes .../plugins/docprops/icons/docprops.png | Bin 549 -> 549 bytes .../docprops/icons/hidpi/docprops-rtl.png | Bin 1060 -> 1060 bytes .../plugins/docprops/icons/hidpi/docprops.png | Bin 1017 -> 1017 bytes .../easyimage/icons/easyimageupload.png | Bin 498 -> 498 bytes .../easyimage/icons/hidpi/easyimageupload.png | Bin 905 -> 905 bytes .../ckeditor/plugins/find/icons/find-rtl.png | Bin 696 -> 696 bytes .../ckeditor/plugins/find/icons/find.png | Bin 696 -> 696 bytes .../plugins/find/icons/hidpi/find-rtl.png | Bin 1384 -> 1384 bytes .../plugins/find/icons/hidpi/find.png | Bin 1384 -> 1384 bytes .../plugins/find/icons/hidpi/replace.png | Bin 1402 -> 1402 bytes .../ckeditor/plugins/find/icons/replace.png | Bin 549 -> 549 bytes .../ckeditor/plugins/flash/icons/flash.png | Bin 633 -> 633 bytes .../plugins/flash/icons/hidpi/flash.png | Bin 1385 -> 1385 bytes .../ckeditor/plugins/forms/icons/button.png | Bin 493 -> 493 bytes .../ckeditor/plugins/forms/icons/checkbox.png | Bin 544 -> 544 bytes .../ckeditor/plugins/forms/icons/form.png | Bin 380 -> 380 bytes .../plugins/forms/icons/hiddenfield.png | Bin 613 -> 613 bytes .../plugins/forms/icons/hidpi/button.png | Bin 833 -> 833 bytes .../plugins/forms/icons/hidpi/checkbox.png | Bin 1024 -> 1024 bytes .../plugins/forms/icons/hidpi/form.png | Bin 660 -> 660 bytes .../plugins/forms/icons/hidpi/hiddenfield.png | Bin 1129 -> 1129 bytes .../plugins/forms/icons/hidpi/imagebutton.png | Bin 1345 -> 1345 bytes .../plugins/forms/icons/hidpi/radio.png | Bin 1426 -> 1426 bytes .../plugins/forms/icons/hidpi/select-rtl.png | Bin 920 -> 920 bytes .../plugins/forms/icons/hidpi/select.png | Bin 905 -> 905 bytes .../forms/icons/hidpi/textarea-rtl.png | Bin 1081 -> 1081 bytes .../plugins/forms/icons/hidpi/textarea.png | Bin 1048 -> 1048 bytes .../forms/icons/hidpi/textfield-rtl.png | Bin 805 -> 805 bytes .../plugins/forms/icons/hidpi/textfield.png | Bin 805 -> 805 bytes .../plugins/forms/icons/imagebutton.png | Bin 755 -> 755 bytes .../ckeditor/plugins/forms/icons/radio.png | Bin 655 -> 655 bytes .../plugins/forms/icons/select-rtl.png | Bin 455 -> 455 bytes .../ckeditor/plugins/forms/icons/select.png | Bin 451 -> 451 bytes .../plugins/forms/icons/textarea-rtl.png | Bin 568 -> 568 bytes .../ckeditor/plugins/forms/icons/textarea.png | Bin 524 -> 524 bytes .../plugins/forms/icons/textfield-rtl.png | Bin 419 -> 419 bytes .../plugins/forms/icons/textfield.png | Bin 419 -> 419 bytes .../plugins/iframe/icons/hidpi/iframe.png | Bin 1837 -> 1837 bytes .../ckeditor/plugins/iframe/icons/iframe.png | Bin 816 -> 816 bytes .../ckeditor/plugins/image/images/noimage.png | Bin 1610 -> 1610 bytes .../plugins/image2/icons/hidpi/image.png | Bin 905 -> 905 bytes .../ckeditor/plugins/image2/icons/image.png | Bin 498 -> 498 bytes .../justify/icons/hidpi/justifyblock.png | Bin 533 -> 533 bytes .../justify/icons/hidpi/justifycenter.png | Bin 576 -> 576 bytes .../justify/icons/hidpi/justifyleft.png | Bin 569 -> 569 bytes .../justify/icons/hidpi/justifyright.png | Bin 549 -> 549 bytes .../plugins/justify/icons/justifyblock.png | Bin 315 -> 315 bytes .../plugins/justify/icons/justifycenter.png | Bin 564 -> 564 bytes .../plugins/justify/icons/justifyleft.png | Bin 342 -> 342 bytes .../plugins/justify/icons/justifyright.png | Bin 348 -> 348 bytes .../plugins/language/icons/hidpi/language.png | Bin 795 -> 795 bytes .../plugins/language/icons/language.png | Bin 433 -> 433 bytes .../ckeditor/plugins/link/images/anchor.png | Bin 752 -> 752 bytes .../plugins/link/images/hidpi/anchor.png | Bin 1109 -> 1109 bytes .../newpage/icons/hidpi/newpage-rtl.png | Bin 653 -> 653 bytes .../plugins/newpage/icons/hidpi/newpage.png | Bin 675 -> 675 bytes .../plugins/newpage/icons/newpage-rtl.png | Bin 440 -> 440 bytes .../plugins/newpage/icons/newpage.png | Bin 444 -> 444 bytes .../pagebreak/icons/hidpi/pagebreak-rtl.png | Bin 807 -> 807 bytes .../pagebreak/icons/hidpi/pagebreak.png | Bin 809 -> 809 bytes .../plugins/pagebreak/icons/pagebreak-rtl.png | Bin 468 -> 468 bytes .../plugins/pagebreak/icons/pagebreak.png | Bin 459 -> 459 bytes .../placeholder/icons/hidpi/placeholder.png | Bin 1576 -> 1576 bytes .../plugins/placeholder/icons/placeholder.png | Bin 835 -> 835 bytes .../preview/icons/hidpi/preview-rtl.png | Bin 1241 -> 1241 bytes .../plugins/preview/icons/hidpi/preview.png | Bin 1254 -> 1254 bytes .../plugins/preview/icons/preview-rtl.png | Bin 625 -> 625 bytes .../plugins/preview/icons/preview.png | Bin 632 -> 632 bytes .../plugins/print/icons/hidpi/print.png | Bin 928 -> 928 bytes .../ckeditor/plugins/print/icons/print.png | Bin 439 -> 439 bytes .../plugins/save/icons/hidpi/save.png | Bin 809 -> 809 bytes .../ckeditor/plugins/save/icons/save.png | Bin 430 -> 430 bytes .../selectall/icons/hidpi/selectall.png | Bin 1117 -> 1117 bytes .../plugins/selectall/icons/selectall.png | Bin 747 -> 747 bytes .../showblocks/icons/hidpi/showblocks-rtl.png | Bin 910 -> 910 bytes .../showblocks/icons/hidpi/showblocks.png | Bin 918 -> 918 bytes .../showblocks/icons/showblocks-rtl.png | Bin 490 -> 490 bytes .../plugins/showblocks/icons/showblocks.png | Bin 483 -> 483 bytes .../plugins/smiley/icons/hidpi/smiley.png | Bin 1708 -> 1708 bytes .../ckeditor/plugins/smiley/icons/smiley.png | Bin 783 -> 783 bytes .../icons/hidpi/sourcedialog-rtl.png | Bin 1018 -> 1018 bytes .../sourcedialog/icons/hidpi/sourcedialog.png | Bin 1041 -> 1041 bytes .../sourcedialog/icons/sourcedialog-rtl.png | Bin 565 -> 565 bytes .../sourcedialog/icons/sourcedialog.png | Bin 571 -> 571 bytes .../templates/icons/hidpi/templates-rtl.png | Bin 796 -> 796 bytes .../templates/icons/hidpi/templates.png | Bin 796 -> 796 bytes .../plugins/templates/icons/templates-rtl.png | Bin 442 -> 442 bytes .../plugins/templates/icons/templates.png | Bin 442 -> 442 bytes .../plugins/uicolor/icons/hidpi/uicolor.png | Bin 1817 -> 1817 bytes .../plugins/uicolor/icons/uicolor.png | Bin 954 -> 954 bytes .../skins/moono-lisa/images/close.png | Bin 615 -> 615 bytes .../skins/moono-lisa/images/hidpi/close.png | Bin 1238 -> 1238 bytes .../moono-lisa/images/hidpi/lock-open.png | Bin 1071 -> 1071 bytes .../skins/moono-lisa/images/hidpi/lock.png | Bin 1062 -> 1062 bytes .../skins/moono-lisa/images/hidpi/refresh.png | Bin 1623 -> 1623 bytes .../skins/moono-lisa/images/lock-open.png | Bin 511 -> 511 bytes .../ckeditor/skins/moono-lisa/images/lock.png | Bin 506 -> 506 bytes .../skins/moono-lisa/images/refresh.png | Bin 757 -> 757 bytes .../ckeditor/skins/moono/images/anchor.png | Bin 929 -> 929 bytes .../ckeditor/skins/moono/images/close.png | Bin 869 -> 869 bytes .../skins/moono/images/hidpi/anchor.png | Bin 1510 -> 1510 bytes .../skins/moono/images/hidpi/close.png | Bin 1732 -> 1732 bytes .../skins/moono/images/hidpi/lock-open.png | Bin 1582 -> 1582 bytes .../skins/moono/images/hidpi/lock.png | Bin 1644 -> 1644 bytes .../skins/moono/images/hidpi/refresh.png | Bin 2311 -> 2311 bytes .../ckeditor/skins/moono/images/lock-open.png | Bin 801 -> 801 bytes .../ckeditor/skins/moono/images/lock.png | Bin 849 -> 849 bytes .../ckeditor/skins/moono/images/refresh.png | Bin 1050 -> 1050 bytes src/ninesurvey-1.0/public/themes/look.png | Bin 12235 -> 12235 bytes .../public/themes/nineblue/look.png | Bin 22565 -> 22565 bytes .../public/themes/ninedark/look.png | Bin 31784 -> 31784 bytes .../public/themes/ninegray/look.png | Bin 32510 -> 32510 bytes .../public/themes/ninegreen/look.png | Bin 25923 -> 25923 bytes .../public/themes/nineorange/look.png | Bin 35955 -> 35955 bytes .../public/themes/ninered/look.png | Bin 23490 -> 23490 bytes .../public/themes/nineyellow/look.png | Bin 31826 -> 31826 bytes .../src/Command/CronInitCommand.php | 18 +- .../src/Command/NotifyQuestCommand.php | 186 ++++++++++ .../src/Command/NotifySurveyCommand.php | 54 +-- .../src/Command/SynchroUsersCommand.php | 5 +- .../src/Controller/QuestController.php | 85 +---- .../src/Controller/SurveyController.php | 343 +++++++++--------- src/ninesurvey-1.0/src/Entity/Survey.php | 200 +++++----- .../src/Entity/{Guest.php => Surveyguest.php} | 64 ++-- .../Entity/{Option.php => Surveyoption.php} | 37 +- src/ninesurvey-1.0/src/Entity/Surveyvote.php | 78 ++++ src/ninesurvey-1.0/src/Entity/User.php | 52 ++- src/ninesurvey-1.0/src/Entity/Vote.php | 77 ---- .../src/Form/QuestheaderType.php | 4 + src/ninesurvey-1.0/src/Form/QuestkeyType.php | 45 +++ .../src/Form/QueststatusType.php | 46 +++ .../{GuestType.php => SurveyguestType.php} | 8 +- .../src/Form/SurveyguestsType.php | 8 +- .../src/Form/SurveyheaderType.php | 16 +- src/ninesurvey-1.0/src/Form/SurveykeyType.php | 2 +- .../src/Form/SurveyoptionsType.php | 4 +- ...pository.php => SurveyguestRepository.php} | 6 +- ...ository.php => SurveyoptionRepository.php} | 6 +- ...epository.php => SurveyvoteRepository.php} | 6 +- .../templates/Quest/byquestkey.html.twig | 6 +- .../templates/Quest/edit.html.twig | 2 +- .../templates/Quest/result.html.twig | 2 +- .../templates/Response/questvote.html.twig | 31 +- .../{vote.html.twig => surveyvote.html.twig} | 156 ++++---- .../templates/Survey/edit.html.twig | 26 +- .../templates/Survey/survey.html.twig | 54 +-- 165 files changed, 947 insertions(+), 682 deletions(-) create mode 100644 src/ninesurvey-1.0/src/Command/NotifyQuestCommand.php rename src/ninesurvey-1.0/src/Entity/{Guest.php => Surveyguest.php} (69%) rename src/ninesurvey-1.0/src/Entity/{Option.php => Surveyoption.php} (62%) create mode 100644 src/ninesurvey-1.0/src/Entity/Surveyvote.php delete mode 100644 src/ninesurvey-1.0/src/Entity/Vote.php create mode 100644 src/ninesurvey-1.0/src/Form/QuestkeyType.php create mode 100644 src/ninesurvey-1.0/src/Form/QueststatusType.php rename src/ninesurvey-1.0/src/Form/{GuestType.php => SurveyguestType.php} (83%) rename src/ninesurvey-1.0/src/Repository/{GuestRepository.php => SurveyguestRepository.php} (60%) rename src/ninesurvey-1.0/src/Repository/{OptionRepository.php => SurveyoptionRepository.php} (60%) rename src/ninesurvey-1.0/src/Repository/{VoteRepository.php => SurveyvoteRepository.php} (61%) rename src/ninesurvey-1.0/templates/Response/{vote.html.twig => surveyvote.html.twig} (55%) 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 40caa6ddfd01c2a26947761de218e4ce8f5e361e..91c2218586079373322c30052388d5ce4a71fc2d 100644 GIT binary patch delta 110 zcmaFP@|d$=Mi`pu8kp-ET80=JTNxWznHXss7+Dz@NK7cN sU|?WSEpd$~Nl7e8waU#;$xN$cFfzcQA@l6{BR~xdp00i_>zopr0MuL_^Z)<= 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 0e4aa2efbeb3f7c1850fc0b51d8b151a0d5c9b08..b52132daa82db251c6feeb5f475e019babd92a69 100644 GIT binary patch delta 93 zcmaFO`I>V=FV|BZ4h}Q!Sx5d@ZJhpxS=z`@*U(7Uz#_!J!phXd%Fs~Pz`)AD;JN?w b6_eMoh^ga{pC+U)!TV=FV_QhVO}{cUAqsG8>jzamNqogH89sTv}Fv1B2)O(^oJsFsPQeMwFx^mZVzc X=BH$)RWcYE;LtElNMB?!JF_7GOg0xJ delta 88 zcmdnNwu5cMZYCc?V_gGtT?3O4Lvt$wV<6HtFtRc*@LjUIf`NfSwZt`|BqgyV)hahX WB{Qv(!N>rI2AiMEM<%l~8v+16$rs!J 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 310e53c7b6dbbf032df4ce41c5a4701215258c68..f6cf57ae1b5a1a129a058fcc59ac0ce6ca1669fb 100644 GIT binary patch delta 109 zcmcc4e4TkhFV|BZ4h}Q!Sx5d@O`QHB!pKn9&`8(7BE-PL%GAWl&`{UFz{G14|LvNAA`m{4B9 sz`&qd;u=wsl30>zm7AZEnO4bQWPn3M=GpT{fEpM)UHx3vIVCg!0NM*5ApigX 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 1fcff90c5859fedbbf6131df09fc20279bbd875a..0eeff4c2a6c318b929863563fd617af960c84c88 100644 GIT binary patch delta 109 zcmcb`e2aNPFV|BZ4h}Q!Sx5d@O`QHZ!pKn9&`8(7BE-PL%GAWl&`{UFz{G14|LvNAA`m{4B9 sz`&qd;u=wsl30>zm7AZEnO4bQWPn3M=GpT{fEpM)UHx3vIVCg!0NtSz79$b})WG2B>gTe~DWM4f(v%(i 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 ba1ba355cf46b004c661f96d585d34323883d75a..e6b62d3ace3c1a47244baddbe67df3adf49b2404 100644 GIT binary patch delta 110 zcmdnUzL9-G1=mv^4h}Q!Sx5d@ZEU*E6k%kjYiOivU=dv7=;)bTNxW$85n3A7y`-bjBDO9 rFfgc=xJHzuB$lLF<>sekrd2W+8Q{>cEJh>{sDZ)L)z4*}Q$iB}zKI># 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 c71851067105640817b7a7360126b1127c60683e..5d716adc515bc9d82c4f6ec027cb852749c7805d 100644 GIT binary patch delta 110 zcmbQjGKFPAFV|BZ4h}Q!Sx5d@ZJe&k7-3|nYiOivU=dg!>Mi`pu8kp-ET80=JTNxWznHXss7+Dz@NK7cN sU|?WSEpd$~Nl7e8waU#;$xN$cFfzcQA@l6{BR~xdp00i_>zopr0B|iG`v3p{ 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 2de477f6b1345fd235c347deff599628924022d4..1def7325c4919cb60650abffd5d265b5a41319b0 100644 GIT binary patch delta 110 zcmbQnF^ywF1=mv^4h}Q!Sx5d@ZEUh(jxaLRH8j#Sum~}*urf8VGBngRFt9Q(cz79$b})WG2B>gTe~DWM4faikp! 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 aa03f4438b2f0bbcbaa5b30a5bf26694cec73c2f..73e18a192d640765c57182a5d62019d9a0efff53 100644 GIT binary patch delta 110 zcmaFC@`7bTFV|BZ4h}Q!Sx5d@ZJb`o7-3|nYiOivU=dd$?Mi`pu8kp-ET80=JTNxWznHXss7+Dz@NK7cN sU|?WSEpd$~Nl7e8waU#;$xN$cFfzcQA@l6{BR~xdp00i_>zopr0M(Hm_W%F@ 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 9e52d1e55285c93a74e5c6a8478f93826f324e52..b8d9130b22168231701ebba9b42f0ce116254d60 100644 GIT binary patch delta 110 zcmaFJ`H*u$1=mv^4h}Q!Sx5d@ZERv^i7+zMH8j#Sum~}*urf8VGBngRFt9Q(cz79$b})WG2B>gTe~DWM4fpWPjA 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 67faa8e213e7d03fbd607f2b13acb64915339792..80d1cfe5e483451d62d8c10d5b7dd52d402a4860 100644 GIT binary patch delta 110 zcmZ3$wSa3v1=mv^4h}Q!Sx5d@ZESL5i7+zMH8j#Sum~}*urf8VGBngRFt9Q(cz79$b})WG2B>gTe~DWM4ff506s 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 88575c146411382e346b4eac6cab915d3c37e1bf..27deb58743d2981ca054f9d52f0600ee0b0c12c6 100644 GIT binary patch delta 110 zcmey$`jvG;FV|BZ4h}Q!Sx5d@ZJf@=6k%kjYiOivU=dh1|MHrgt8kp-ET80=JTNxWznHXss7+Dz@NK7cN sU|?WSEpd$~Nl7e8waU#;$xN$cFfzcQA@l6{BR~xdp00i_>zopr0J!uXp#T5? 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 11284089f62e01b98ea4f2b456d1bc772b375584..3e2586a953ac160e90e8e91dd37b22d939df4be6 100644 GIT binary patch delta 110 zcmX@idYE-W1=mv^4h}Q!Sx5d@ZESkU7-3|nYiOivU=dOV delta 110 zcmX@idYE-W1=j;^CSFv7=;)bTNzne8JKGu7+M(^9O1f~ s#lXOzTH+c}l9E`GYL%Oxl9^V?U}S(p!`ATBYd{SQp00i_>zopr0M)=AzW@LL 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 c46e5140ae46320062a6aa96f2daa7075a8bdfb6..cc8e4b50220187fb8dd10b76489a72cb3ce5ce66 100644 GIT binary patch delta 93 zcmcc1d6#oS1=mv^4h}Q!Sx5d@ZERv@kv1~aH8j#Sum~}*urf8VGBngRFt9Q(cf3QMi`pu8kp-ET80=JTNxWznHXss7+Dz@NK7cN sU|?WSEpd$~Nl7e8waU#;$xN$cFfzcQA@l6{BR~xdp00i_>zopr0G!qyY5)KL 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 eb63fe370bc1cbbd33d728e15fdffb8f867f4ebc..3dc7eb6ba77e26f381fd302b2897ab9b28f6b56d 100644 GIT binary patch delta 93 zcmeCgTe~DWM4f^vD?V delta 93 zcmeCsCw1_s&&hCuQ<zmvv4FO#qDz7ySSL 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 c6c63532af3d65209154cfd502c36479878ade1c..3317caa5da969705f2960dfab1da0afc4d350b9e 100644 GIT binary patch delta 110 zcmbQwGM{BaFV|BZ4h}Q!Sx5d@ZJchv7-3|nYiOivU=d9wz_* delta 110 zcmbQwGM{BaFV_QhVO}{cUAqsG8>bsEMi`pu8kp-ET80=JTNxWznHXss7+Dz@NK7cN sU|?WSEpd$~Nl7e8waU#;$xN$cFfzcQA@l6{BR~xdp00i_>zopr0DW{G8~^|S 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 16a500069fade465b1d7db8c7a705949c12b9fd5..d4030e74c21627fcaeebe67bd9d3570f36a36767 100644 GIT binary patch delta 110 zcmZ3=vXo^)FV|BZ4h}Q!Sx5d@ZJch#7-3|nYiOivU=dgEwMi`pu8kp-ET80=JTNxWznHXss7+Dz@NK7cN sU|?WSEpd$~Nl7e8waU#;$xN$cFfzcQA@l6{BR~xdp00i_>zopr0EDt0E&u=k 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 3e468bd59cb96ea82b17ff6fe31f801c3416893d..60acc4196d0d4aac3d97a3a0a6f913ba87a1d1b0 100644 GIT binary patch delta 110 zcmZ3&v4mqn1=mv^4h}Q!Sx5d@ZEW&ljxaLRH8j#Sum~}*urf8VGBngRFt9Q(cz79$b})WG2B>gTe~DWM4ff{GnA 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 ac44303ed2b4ab205b0e2d79c73ba1e3348e8dfc..71a960b890d0c25aa4bcda055300d6bef6a97d98 100644 GIT binary patch delta 110 zcmey#{*!$|1=mv^4h}Q!Sx5d@ZETWfjxaLRH8j#Sum~}*urf8VGBngRFt9Q(cz79$b})WG2B>gTe~DWM4fy2~B1 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 8ea97259df1e428333b1dad62e48f94faa666a0d..d439d2405f6708ccae9da99b11948f634bd2a4fd 100644 GIT binary patch delta 110 zcmeyw{E2x&FV|BZ4h}Q!Sx5d@ZJf@`7-3|nYiOivU=dcffMi`pu8kp-ET80=JTNxWznHXss7+Dz@NK7cN sU|?WSEpd$~Nl7e8waU#;$xN$cFfzcQA@l6{BR~xdp00i_>zopr0JBRTlK=n! 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 d0f21aeec2061dd27fc335d91509001bf040b394..3d6218b2909432a4ae04b641a209733e6fca5bd6 100644 GIT binary patch delta 110 zcmeBV?_{4)!S$4fgTst_){#F}8=KZMMHm_C8XD;uScDi@Secqw85-&u7+4t?Jolfz sf`NfSwZt`|BqgyV)hahXB{Qv(!N>rIhG|0jB0vocp00i_>zopr01dz%R{#J2 delta 110 zcmeBV?_{4)!S#TfiC2-KneQCO#-{a55r$^EhK9NZMj?jAR>sCw1_s&&hCuQ<bP0l+XkKjzJw^ 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 0fa67442c7211d77c8554b745183a93dea45f498..3714e977043880646e4c5641bc5ebe210c6b0450 100644 GIT binary patch delta 110 zcmdnNx`TB>FV|BZ4h}Q!Sx5d@ZJd6RF~Z1D*U(7Uz#_!J!phXd%Fs~Pz`)AD;JN?w t6$}gvswJ)wB`Jv|saCo9DVb@N3`PbxG)xoH7XfNu@O1TaS?83{1OQDV9`pbJ delta 110 zcmdnNx`TB>FV_QhVO}{cUAqsG8>gRSj4(9QH89sTvFV|BZ4h}Q!Sx5d@ZJd6RF~Z1D*U(7Uz#_!J!phXd%Fs~Pz`)AD;JN?w t6$}gvswJ)wB`Jv|saCo9DVb@N3`PbxG)xoH7XfNu@O1TaS?83{1OQDV9`pbJ delta 110 zcmdnNx`TB>FV_QhVO}{cUAqsG8>gRSj4(9QH89sTvz79$b})WG2B>gTe~DWM4f)~Fr^ 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 96e954e72314f6d8c731b0dd3264e26acd5bebc6..786a6e83561fdcb9f638300cb65f7dac818411c9 100644 GIT binary patch delta 110 zcmaFC^@3|c1=mv^4h}Q!Sx5d@ZEWgei7+zMH8j#Sum~}*urf8VGBngRFt9Q(cz79$b})WG2B>gTe~DWM4f)~Fr^ 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 bd8f6add61dd30c452a9a27847076c79bd55967b..559e275c9f3d05e38325a50e5d00d9a7686595e8 100644 GIT binary patch delta 110 zcmeyx^^0pl1=mv^4h}Q!Sx5d@ZERY=5@BShYiOivU=dQXs8XD>v7=;)bTNxW$85n3A7y`-bjBDO9 rFfgc=xJHzuB$lLF<>sekrd2W+8Q{>cEJh>{sDZ)L)z4*}Q$iB}>|!1~ 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 db16ea4f53e9d8fed6c9d2b7ab4d553fdc4ba57e..47c2b8cd347597da2cf2d7804f3b716f42df7300 100644 GIT binary patch delta 110 zcmZ3=vXo^)FV|BZ4h}Q!Sx5d@ZJch#7-3|nYiOivU=dgEwMi`pu8kp-ET80=JTNxWznHXss7+Dz@NK7cN sU|?WSEpd$~Nl7e8waU#;$xN$cFfzcQA@l6{BR~xdp00i_>zopr0EDt0E&u=k 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 983cc8e7015f4aba0ffd70a489d2ad1a737ac4c0..5f573299461b2a54f627da0d2881b91e2ee5ab22 100644 GIT binary patch delta 110 zcmey#@{?skFV|BZ4h}Q!Sx5d@ZJgf47-3|nYiOivU=de?MMi`pu8kp-ET80=JTNxWznHXss7+Dz@NK7cN sU|?WSEpd$~Nl7e8waU#;$xN$cFfzcQA@l6{BR~xdp00i_>zopr0O}SWDgXcg 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 986b864f57b1bfa4a98b72edcd1f0cd7357547b7..3045d50feb7b0d740b253d93bac19931be048791 100644 GIT binary patch delta 110 zcmaFK^^$8s1=mv^4h}Q!Sx5d@ZEWgii7+zMH8j#Sum~}*urf8VGBngRFt9Q(cz79$b})WG2B>gTe~DWM4f*WDfo 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 ec9bf1b855c318aacddbad6c332884a0a080e602..019049924d9d5ba24b53015754616d3d8e8a6c08 100644 GIT binary patch delta 92 zcmaFM{FZq_FV|BZ4h}Q!Sx5d@O`QHu+Q?AX&`8(7BE-PL%GAWl&`{UFz{q4 delta 92 zcmaFM{FZq_FV_QhVO}{cUAqsG6Q}=^HZ;>UFxNG-3^6peGB&U>G14|LvNAA`m{49Z ac>|-EIu7~Fv*(X60D-5gpUXO@geCy)o*Fv< 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 868626de22a0de85df9745f8f720e655f23af6c9..0831ecf48a7841303dea341bba399f4c9d58fbd9 100644 GIT binary patch delta 110 zcmZ3$vVdhmFV|BZ4h}Q!Sx5d@ZJch%7-3|nYiOivU=dbsGMi`pu8kp-ET80=JTNxWznHXss7+Dz@NK7cN sU|?WSEpd$~Nl7e8waU#;$xN$cFfzcQA@l6{BR~xdp00i_>zopr0Dh?+9{>OV 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 e1715578eb02c6eb711102df87dd6f8bf3e2c117..c7bb836a6ac5ce3e2e01fe40c5a2c3ec7e58a52e 100644 GIT binary patch delta 92 zcmeyv^oMCeFV|BZ4h}Q!Sx5d@O`P5Nw=53F(V40D-5gpUXO@geCwcx*31~ delta 92 zcmeyv^oMCeFV_QhVO}{cUAqsG6Q}n|8=C1FnClu^h8P-K85>xc7-<_ASs55eOen9I aY|kjBjzd24?D-=MK;Y@>=d#Wzp$P!RU>S7) 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 060dfa714b3f802b77712c68399fd4b7d1909129..7555e5772245cfe7831858e986ac532701df83bb 100644 GIT binary patch delta 110 zcmaFL@|0ylFV|BZ4h}Q!Sx5d@ZJb`l7-3|nYiOivU=dg2sMi`pu8kp-ET80=JTNxWznHXss7+Dz@NK7cN sU|?WSEpd$~Nl7e8waU#;$xN$cFfzcQA@l6{BR~xdp00i_>zopr0MYUu?f?J) 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 15a9c9293b4ef66fd25db12ce030f432ec9cf1df..7f10882f62c3e7e3012bce1050a3ec13ad28375d 100644 GIT binary patch delta 110 zcmX@ec93mC1=mv^4h}Q!Sx5d@ZEQ+siZC+NH8j#Sum~}*urf8VGBngRFt9Q(cz79$b})WG2B>gTe~DWM4fqk$cV 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 af19fe336a29db48702697931128ee713d28f571..e439b01b77858a3d6921a0bd4a826d81e0277325 100644 GIT binary patch delta 110 zcmZqRXyBMo!S$4fgTst_){#F}8=KUaBa94n4UKdSEJ6${tV~U;3=MS+46F>bzW@LL delta 110 zcmZqRXyBMo!S#TfiC2-KneQCO#wIo92tzYnLqlByqYy)5D`R6T0|RXXLm+vbam`x> r1_sp<*NBpo#FA92-29Zxv`Pje0~{Kb#fSs~H86O(`njxgN@xNAR~8(} 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 7953e8fec62c721b8a3b4fec589d096797cc837b..006315288c166a28402812e46a15e53ec30e13d6 100644 GIT binary patch delta 110 zcmbQjI)!yY1=mv^4h}Q!Sx5d@ZEV`b7-3|nYiOivU=dv7=;)bTNxW$85n3A7y`-bjBDO9 rFfgc=xJHzuB$lLF<>sekrd2W+8Q{>cEJh>{sDZ)L)z4*}Q$iB}nSLF8 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 1413b11a12428e8a1e474c876161e2fc357c826e..83881ae82396049944bc3d6660398d4da267d65c 100644 GIT binary patch delta 110 zcmaFK@seXg1=mv^4h}Q!Sx5d@ZEWgijxaLRH8j#Sum~}*urf8VGBngRFt9Q(cBMi-S4Gnb-j6w{Jt&EMW3=Fgl41wfz#x-vl r7#LJbTq8z79$b})WG2B>gTe~DWM4f)zcmX 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 5a5e325170be4e2db21a564ab2470833db072e67..eaa55d9f37ba2f0dcbca266d2a66c0a385f20de0 100644 GIT binary patch delta 110 zcmX@eb&zX91=mv^4h}Q!Sx5d@ZEQ+si7+zMH8j#Sum~}*urf8VGBngRFt9Q(cz79$b})WG2B>gTe~DWM4frQXs8XD>v7=;)bTNxW$85n3A7y`-bjBDO9 rFfgc=xJHzuB$lLF<>sekrd2W+8Q{>cEJh>{sDZ)L)z4*}Q$iB}oiZJU 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 cf5a0da801534a1b40895cf204f393f0365c2884..61f75c0b1a74aeef57663099f6cf9d8d9769f054 100644 GIT binary patch delta 110 zcmbQiK7)Ni1=mv^4h}Q!Sx5d@ZEV`d6k%kjYiOivU=dv7=;)bTNxW$85n3A7y`-bjBDO9 rFfgc=xJHzuB$lLF<>sekrd2W+8Q{>cEJh>{sDZ)L)z4*}Q$iB}pj;h} 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 bfc23b2ca7e1cf6d19fedfdb88e52427f8c7b341..423dedc5c248a22eadeda5cab7a78302245c6318 100644 GIT binary patch delta 110 zcmeBV?_{4)!S$4fgTst_){#F}8=KZMMHm_C8XD;uScDi@Secqw85-&u7+4t?Jolfz sf`NfSwZt`|BqgyV)hahXB{Qv(!N>rIhG|0jB0vocp00i_>zopr01dz%R{#J2 delta 110 zcmeBV?_{4)!S#TfiC2-KneQCO#-{a55r$^EhK9NZMj?jAR>sCw1_s&&hCuQ<bP0l+XkKjzJw^ 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 e568912b805711583bafcb8f46aca207ea2c387d..dd5b2ef3e9022f4df352fff503182481efd855cf 100644 GIT binary patch delta 110 zcmdnVv6Ev$1=mv^4h}Q!Sx5d@ZET8XjxaLRH8j#Sum~}*urf8VGBngRFt9Q(cz79$b})WG2B>gTe~DWM4fo8ujH 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 3e9e891ad88209a6f34ee610be5548701c1ec64d..9929e118d15e4764708f2ebc5f7b5c4d364fb7bb 100644 GIT binary patch delta 110 zcmbQiF@s}51=mv^4h}Q!Sx5d@ZEUh*jxaLRH8j#Sum~}*urf8VGBngRFt9Q(cz79$b})WG2B>gTe~DWM4fbPgR6 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 c39a05447cabc3197dc2a5419a4f88e1d21be43c..845746844a604780e2762ed4ef7b11b885d8f430 100644 GIT binary patch delta 110 zcmZ3=wv=r`1=mv^4h}Q!Sx5d@ZEW&piZC+NH8j#Sum~}*urf8VGBngRFt9Q(cz79$b})WG2B>gTe~DWM4ffwdho 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 c39a05447cabc3197dc2a5419a4f88e1d21be43c..845746844a604780e2762ed4ef7b11b885d8f430 100644 GIT binary patch delta 110 zcmZ3=wv=r`1=mv^4h}Q!Sx5d@ZEW&piZC+NH8j#Sum~}*urf8VGBngRFt9Q(cz79$b})WG2B>gTe~DWM4ffwdho 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 ab768c126efce72b7917a2fb7b556b8483db9373..a394a68726e1485ebb8a957df5a573149685a8d7 100644 GIT binary patch delta 110 zcmey&`k8e?FV|BZ4h}Q!Sx5d@ZJf@+6k%kjYiOivU=dh1{MHrgt8kp-ET80=JTNxWznHXss7+Dz@NK7cN sU|?WSEpd$~Nl7e8waU#;$xN$cFfzcQA@l6{BR~xdp00i_>zopr0Je%An*aa+ 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 08b946248f6af76f11157874bdcb66442d703366..92080a639cfa66e4bc0bf781ce82e169529798d4 100644 GIT binary patch delta 110 zcmeBY?Ps0P%k`9pgTst_){#F}8>cT|j4(3PH8j#Sum~}*urf8VGBngRFt9Q(cG14|LvNAA`m{4B9 sz`&qd;u=wsl30>zm7AZEnO4bQWPn3M=GpT{fEpM)UHx3vIVCg!0LJSc@c;k- 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 2906e559cc55b6581b89aab247190c3a0e03ec5f..94e62687f55cef8c256d0eafe2ee31cb7e0c2a53 100644 GIT binary patch delta 109 zcmX@ie3*GcFV|BZ4h}Q!Sx5d@O`Luu!pKn9&`8(7BE-PL%GAWl&`{UFz{G14|LvNAA`m{4B9 sz`&qd;u=wsl30>zm7AZEnO4bQWPn3M=GpT{fEpM)UHx3vIVCg!0Ky|4f3RMi`pu8kp-ET80=JTNxWznHXss7+Dz@NK7cN sU|?WSEpd$~Nl7e8waU#;$xN$cFfzcQA@l6{BR~xdp00i_>zopr0Gpv6X8-^I 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 91f6c2307e006190bdc1ced0385b42685ec2efd4..a44db44208adabc0e81c80fce53592ae4874fbdc 100644 GIT binary patch delta 93 zcmeBS>0z1B%k`9pgTst_){#F}8>h=MN*fvK8XD;uScDi@Secqw85-&u7+4t?Jolfz bV)A)LF?AgB(}eUz7=Xaj)z4*}Q$iB};olhL delta 93 zcmeBS>0z1B%k_X=m{(3q*Y1Pl#_6(*(uQWb2IjhkmLZ15R>lTaCPvx@Mpgy}5);ZR bCZA^%Q^z5ndG`Df1|aZs^>bP0l+XkKe}Nd< 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 123948a4b6bcfbdcf972484ef2a13aab6fcf920f..583a531071553dcb855558507a5934b5cb516b68 100644 GIT binary patch delta 109 zcmZ3?yqI}HFV|BZ4h}Q!Sx5d@O`N_Z!pKn9&`8(7BE-PL%GAWl&`{UFz{G14|LvNAA`m{4B9 sz`&qd;u=wsl30>zm7AZEnO4bQWPn3M=GpT{fEpM)UHx3vIVCg!0Gs0;g#Z8m 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 123948a4b6bcfbdcf972484ef2a13aab6fcf920f..583a531071553dcb855558507a5934b5cb516b68 100644 GIT binary patch delta 109 zcmZ3?yqI}HFV|BZ4h}Q!Sx5d@O`N_Z!pKn9&`8(7BE-PL%GAWl&`{UFz{G14|LvNAA`m{4B9 sz`&qd;u=wsl30>zm7AZEnO4bQWPn3M=GpT{fEpM)UHx3vIVCg!0Gs0;g#Z8m 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 d99d0f352a9081940a906533073caa8c78cafa6c..8ac8ad44f6d688af23675421068aa2ca0afbbf03 100644 GIT binary patch delta 93 zcmZ3>x0Y{01=mv^4h}Q!Sx5d@ZEOl=lQuHcH8j#Sum~}*urf8VGBngRFt9Q(cx0Y{01=j;^CSFB`X1;SA8=HdJqz%n<4Gnb-j6w{Jt&EMW3=Fgl41wfz#x-vz ae_#_+$05HgMkJ5{2s~Z=T-G@yGywpj{}_A# 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 a2f55459a0d65d4d593770294b8f42dd98cf53fe..c1fc663b42212ba3a964ae55c18ad742963305ca 100644 GIT binary patch delta 110 zcmdnMwt;OzFV|BZ4h}Q!Sx5d@ZJh4N6k%kjYiOivU=dc%mMHrgt8kp-ET80=JTNxWznHXss7+Dz@NK7cN sU|?WSEpd$~Nl7e8waU#;$xN$cFfzcQA@l6{BR~xdp00i_>zopr0F(nBQ~&?~ 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 74c6ee9262bbd0d379738c63f673dca93b34f08b..6ab8af6f06f1a9f027a2ef1852bce4b793d6dddd 100644 GIT binary patch delta 96 zcmX@bbBbrfC)NlfLtR57T?2~{0}Crt6DvbQT>}Fv1B2)O(^oJsFsPQeMwFx^mZVzc e=BH$)RWcYE;LtElNM8h~fx*+&&t;ucLK6To`x(9f delta 96 zcmX@bbBbrfC)NlrIhG|0jB0vocp00i_>zopr01dz%R{#J2 delta 110 zcmeBV?_{4)!S#TfiC2-KneQCO#-{a55r$^EhK9NZMj?jAR>sCw1_s&&hCuQ<bP0l+XkKjzJw^ 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 8ea97259df1e428333b1dad62e48f94faa666a0d..d439d2405f6708ccae9da99b11948f634bd2a4fd 100644 GIT binary patch delta 110 zcmeyw{E2x&FV|BZ4h}Q!Sx5d@ZJf@`7-3|nYiOivU=dcffMi`pu8kp-ET80=JTNxWznHXss7+Dz@NK7cN sU|?WSEpd$~Nl7e8waU#;$xN$cFfzcQA@l6{BR~xdp00i_>zopr0JBRTlK=n! 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 5c0cf4392e248c653846cb71b7eca1d202153f4f..9593d71b52faf725dbcedde0363d36794e1aa326 100644 GIT binary patch delta 110 zcmbQrGL>aQ1=mv^4h}Q!Sx5d@ZEUh;j4(3PH8j#Sum~}*urf8VGBngRFt9Q(caQ1=j;^CSFB`X1;SA8=I^dBMi-S4Gnb-j6w{Jt&EMW3=Fgl41wfz#x-vl r7#LJbTq8z79$b})WG2B>gTe~DWM4fY+D@u 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 fd751be5003115acaf6b531dc254a921e1042074..035ded657f611bfadfdfa9e4cbc58ae6181e48be 100644 GIT binary patch delta 110 zcmX@Wa)4z*1=mv^4h}Q!Sx5d@ZEQ+oj4(3PH8j#Sum~}*urf8VGBngRFt9Q(cz79$b})WG2B>gTe~DWM4fph6vg 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 a109ad3c9ac5ed9c75eadf3b49a187b08ba4324b..3309d58feac078b69a42119216410ddaca29f8c1 100644 GIT binary patch delta 110 zcmdnVvXf;(1=mv^4h}Q!Sx5d@ZET8Xj4(3PH8j#Sum~}*urf8VGBngRFt9Q(cz79$b})WG2B>gTe~DWM4fm(Lw) 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 5125d56f9068318e75a188aa10306164ced6cb5b..6cc6c2f9de05277eaa84ff4cf6f3fa0923834619 100644 GIT binary patch delta 110 zcmZ3=vXo^)1=mv^4h}Q!Sx5d@ZEW&pj4(3PH8j#Sum~}*urf8VGBngRFt9Q(cz79$b})WG2B>gTe~DWM4ff2$oX 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 ffe0620cdaf1a7a47c26aac8c2dab2f77aff9d64..26b0736b3f29369a39102bb8cc45813d9d983af5 100644 GIT binary patch delta 91 zcmdnZw3}%{FV|BZ4h}Q!Sx5d@O`Pr{ZDgoxXryak5n^CrWolw&XsByoU}a$N+<*Ft ZiT}jZaY#=S(idR>0#8>zmvv4FO#t-D8F>Hz delta 91 zcmdnZw3}%{FV_QhVO}{cUAqsG6Q}z~8=C1FnClu^h8P-K85>xc7-<_ASs55eOen9I Z_)kn7hjixI^G6tfz|+;wWt~$(69AQL8Eyao 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 8b5b40fd762f2aa2f99673af16bb106fa2e06087..3d7c31d7261f20022d4ac1c577b48c052f353a3c 100644 GIT binary patch delta 110 zcmdnOvV~hQ6Mi`pu8kp-ET80=JTNxWznHXss7+Dz@NK7cN sU|?WSEpd$~Nl7e8waU#;$xN$cFfzcQA@l6{BR~xdp00i_>zopr0G7=jTL1t6 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 a60d07938f24b89f980fa47a79cf9ae434f5b94c..c7f78be75014b26fcec3a1aff3c7d45dfd20b7f5 100644 GIT binary patch delta 109 zcmcb{bd703FV|BZ4h}Q!Sx5d@O`M({VPvRlXryak5n^CrWolw&XsByoU}a$N+<*EC s1_lPz64!{5l*E!$tK9sQ%(O}dBLf^7rU~hb05vdpy85}Sb4q9e04*9GrvLx| delta 109 zcmcb{bd703FV_QhVO}{cUAqsG6Q`#~7@FxCnClu^h8P-K85>xc7-<_ASs55eOen8l rU|>)!ag8WRNi0dV%FR#7OsixtGQgoB^X&N}Kn)C@u6{1-oD!MNw=53F(V40D-5gpUXO@geCw1dKmx! delta 92 zcmcb^bcbm|FV_QhVO}{cUAqsG6Q}1&8=C1FnClu^h8P-K85>xc7-<_ASs55eOen9I aEYB#Wjzd24?D-=MK;Y@>=d#Wzp$Pz>AQ<%k 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 7159a1f6d7cad59a75cbacd7cc33e1baec6959c4..c717142585a9c8ceca4644401a93fb6b57c9ffe1 100644 GIT binary patch delta 93 zcmbQuHk)li1=mv^4h}Q!Sx5d@ZESL6k~T8bH8j#Sum~}*urf8VGBngRFt9Q(c`FFf`LOFxNG-3^6peGB&U>G14|LvNAA`m{4B9 sz`&qd;u=wsl30>zm7AZEnO4bQWPn3M=GpT{fEpM)UHx3vIVCg!0IZ)LuK)l5 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 d94adb41306ffd96741ae5e5ca1e8d749853f3fb..19a623402df0c3d91ec66a9245a0bdb1ac946a49 100644 GIT binary patch delta 110 zcmeys`hj&q1=mv^4h}Q!Sx5d@ZEO-_iZC+NH8j#Sum~}*urf8VGBngRFt9Q(cz79$b})WG2B>gTe~DWM4fy{{d} 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 9624cb673864e321e731e848fbfdc95fd9b44ad6..81123f64d89b5e133975367d9b949d3e01f38ffb 100644 GIT binary patch delta 93 zcmeBW?PZ-%!S$4fgTst_){#F}8=E#WN*fvK8XD;uScDi@Secqw85-&u7+4t?Jolfz bVsZeJm^u#mX+ruU3_#%N>gTe~DWM4f>>n7{ delta 93 zcmeBW?PZ-%!S#TfiC2-KneQCO#-`1T(uQWbhK9NZMj?jAR>sCw1_s&&hCuQ<zmvv4FO#p;s7vTT^ 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 8533ba94fe4e9cbf5c2dc06a4e13f8cc1883f710..ba8b3a8f756cb0603b14757003ba05791e10341a 100644 GIT binary patch delta 110 zcmZ3?x|nrB1=mv^4h}Q!Sx5d@ZEQNp7-3|nYiOivU=dv7=;)bTNxW$85n3A7y`-bjBDO9 rFfgc=xJHzuB$lLF<>sekrd2W+8Q{>cEJh>{sDZ)L)z4*}Q$iB}tC=0D 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 c791c6ee4053632603321c9b62121271411e2b85..55092916f21c587fe5212f8dff0697e338c461af 100644 GIT binary patch delta 109 zcmdnNyn}f{FV|BZ4h}Q!Sx5d@O`Lu*!pKn9&`8(7BE-PL%GAWl&`{UFz{G14|LvNAA`m{4B9 sz`&qd;u=wsl30>zm7AZEnO4bQWPn3M=GpT{fEpM)UHx3vIVCg!0JQxc!~g&Q 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 f176ddb1a359f96c0b4c44686700021b7621205f..36f767603baee5ebfd88bb47d2a626017359705f 100644 GIT binary patch delta 92 zcmdnPyoY&0FV|BZ4h}Q!Sx5d@O`LvK+Q?AX&`8(7BE-PL%GAWl&`{UFz{UFxNG-3^6peGB&U>G14|LvNAA`m{49Z axt>u>9fy48+4DyjfWXt$&t;ucLK6VBlo@vb 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 70ec9f8d7fb97dbdf97ec844c80d03c6a3e1e310..5ba207acc68c68106ce60b686ffec73fea917979 100644 GIT binary patch delta 110 zcmZ3^ww!H31=mv^4h}Q!Sx5d@ZEW&oiZC+NH8j#Sum~}*urf8VGBngRFt9Q(cz79$b})WG2B>gTe~DWM4fgdZI_ 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 5af52d50daa124e1571a01c56f198f53751fb386..4215cd4878801473dc50f27cfc234f72f6d6f325 100644 GIT binary patch delta 110 zcmZ3z79$b})WG2B>gTe~DWM4fhKU_N 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 35bea0e227b3af064dbd3416a7f26ace3c6837fe..3587651c56b97ede8222f27d63e28efc538b5ab3 100644 GIT binary patch delta 109 zcmcb@e1&;JFV|BZ4h}Q!Sx5d@O`QHT!pKn9&`8(7BE-PL%GAWl&`{UFz{G14|LvNAA`m{4B9 sz`&qd;u=wsl30>zm7AZEnO4bQWPn3M=GpT{fEpM)UHx3vIVCg!0M>OM7ytkO 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 cf075ad7f2d0722628618e0fefe89813da26c6b4..bc67ec3a171e9031b9d71f409ac0adac3d121a34 100644 GIT binary patch delta 92 zcmX@je42SeFV|BZ4h}Q!Sx5d@O`Lv5+Q?AX&`8(7BE-PL%GAWl&`{UFz{UFxNG-3^6peGB&U>G14|LvNAA`m{49Z axsOpy9fy48+4DyjfWXt$&t;ucLK6VT3K_Ei 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 25d2361041cd9f55fdc577dabaf1b7f17999528b..e67a26b48c92efde002971b687290301b3437687 100644 GIT binary patch delta 110 zcmZ3%vw~+r1=mv^4h}Q!Sx5d@ZEW&mjW9CQH8j#Sum~}*urf8VGBngRFt9Q(cz79$b})WG2B>gTe~DWM4fi*g-H 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 8d5b8195bad69770d7777138bd0cee5b23c19cbc..a41bfa56f63574202917032cb052cb8a1aaf9076 100644 GIT binary patch delta 110 zcmX@ic9?BKFV|BZ4h}Q!Sx5d@ZJZv$6k%kjYiOivU=dfdbMHrgt8kp-ET80=JTNxWznHXss7+Dz@NK7cN sU|?WSEpd$~Nl7e8waU#;$xN$cFfzcQA@l6{BR~xdp00i_>zopr0IKpHjQ{`u 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 530fee0d92560fdddf949850de914c55ef0f9198..725e32370b4857847ad4ed8f422c203a7b8dc88f 100644 GIT binary patch delta 110 zcmcb~d6RQO1=mv^4h}Q!Sx5d@ZEX6_9ARXrYiOivU=dv7=;)bTNxW$85n3A7y`-bjBDO9 rFfgc=xJHzuB$lLF<>sekrd2W+8Q{>cEJh>{sDZ)L)z4*}Q$iB}@Y^0% 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 e9629b3507caa589669207f8be3bfe40c6945a8d..dd117d986fe5cc4b68085f4ee2d094a640487162 100644 GIT binary patch delta 110 zcmaFH`HXWy1=mv^4h}Q!Sx5d@ZEWIUi7+zMH8j#Sum~}*urf8VGBngRFt9Q(cz79$b})WG2B>gTe~DWM4frRE)e 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 fa568d474bd3398feb8c8472c329b1efec0726c1..2ffa76530702ec40831ffc705d854e22b119663b 100644 GIT binary patch delta 110 zcmey!@{wgiFV|BZ4h}Q!Sx5d@ZJgf37-3|nYiOivU=dcrhMi`pu8kp-ET80=JTNxWznHXss7+Dz@NK7cN sU|?WSEpd$~Nl7e8waU#;$xN$cFfzcQA@l6{BR~xdp00i_>zopr0N`#P5&!@I 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 4111cc185e23bf72601c98cfb2d7f10c40dc7f02..143c85b81d5ce488b6c1005ad7836b19cf906640 100644 GIT binary patch delta 110 zcmeyt@`GhUFV|BZ4h}Q!Sx5d@ZJgf87-3|nYiOivU=de?NMi`pu8kp-ET80=JTNxWznHXss7+Dz@NK7cN sU|?WSEpd$~Nl7e8waU#;$xN$cFfzcQA@l6{BR~xdp00i_>zopr0O;W#CjbBd 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 6b62afdff94e777215f437e9d2bf5cf029b59cca..9dedd01208e208fd568a6f574631fd581f6c257c 100644 GIT binary patch delta 110 zcmZ3$zJPr~1=mv^4h}Q!Sx5d@ZEQNm6k%kjYiOivU=dv7=;)bTNxW$85n3A7y`-bjBDO9 rFfgc=xJHzuB$lLF<>sekrd2W+8Q{>cEJh>{sDZ)L)z4*}Q$iB}sstUT 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 598e4d170c6cbccbcad33ae19681ba774823f84a..5ab7747a3ebdcd19753fcb088eb4dbbb65295dd2 100644 GIT binary patch delta 109 zcmdnayq$SMFV|BZ4h}Q!Sx5d@O`Lur!pKn9&`8(7BE-PL%GAWl&`{UFz{G14|LvNAA`m{4B9 sz`&qd;u=wsl30>zm7AZEnO4bQWPn3M=GpT{fEpM)UHx3vIVCg!0JF;;!2kdN 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 e64ea052b852ac23d2dee92363393f2fcac56640..9196b8f6cb8bac7ae62c11f29700eb5f39c09eb0 100644 GIT binary patch delta 110 zcmZ3z79$b})WG2B>gTe~DWM4fhKU_N 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 d79fa5881fddaf2127e6d5b38a1fcfb3bd72ff6e..c8e8f550c7a30833b4263704b1ac66d4332180c5 100644 GIT binary patch delta 92 zcmZ3-ypDN7FV|BZ4h}Q!Sx5d@O`N`8+Q?AX&`8(7BE-PL%GAWl&`{UFz{UFxNG-3^6peGB&U>G14|LvNAA`m{49Z axsXvz9fy48+4DyjfWXt$&t;ucLK6U`NEtr> 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 ef9c67bd6bdc7027efc6fb18fdc92f120a6c91a2..67d77093f455570246c3337e76285e8364a3147b 100644 GIT binary patch delta 93 zcmcc1ahGF41=mv^4h}Q!Sx5d@ZER|0mNqifH8j#Sum~}*urf8VGBngRFt9Q(cjzalr}WeH89sTvgTe~DWM4f?<*ML delta 93 zcmeBU?_-}(!S#TfiC2-KneQCO#-=Sy(uQWbhK9NZMj?jAR>sCw1_s&&hCuQ<zmvv4FO#p{*7wZ53 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 94a8a39cfd4d2aa7846a5393de6e0278d01f9d12..bbc4a36338b06b638edeae8c70f0f0571e6d20c3 100644 GIT binary patch delta 110 zcmbQnK8<}s1=mv^4h}Q!Sx5d@ZEV`Z6k%kjYiOivU=dv7=;)bTNxW$85n3A7y`-bjBDO9 rFfgc=xJHzuB$lLF<>sekrd2W+8Q{>cEJh>{sDZ)L)z4*}Q$iB}o$?)s 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 75bfd37a28e2fdadaedfe33c7fafe94779be1046..3d47faed3714546e33674608b0d2c8c914334280 100644 GIT binary patch delta 109 zcmaFG{EB%(FV|BZ4h}Q!Sx5d@O`QHa!pKn9&`8(7BE-PL%GAWl&`{UFz{G14|LvNAA`m{4B9 sz`&qd;u=wsl30>zm7AZEnO4bQWPn3M=GpT{fEpM)UHx3vIVCg!0Pw*dS^xk5 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 09fe2c7dbb12176dbaa46e87edea5d4ff338c833..d12ecefcbf90ba437f08225c11e40d9000d02168 100644 GIT binary patch delta 109 zcmaFN{Fr${FV|BZ4h}Q!Sx5d@O`QHE!pKn9&`8(7BE-PL%GAWl&`{UFz{G14|LvNAA`m{4B9 sz`&qd;u=wsl30>zm7AZEnO4bQWPn3M=GpT{fEpM)UHx3vIVCg!0O(^MMF0Q* 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 810d702e53e3792450e5f2bed24ec49cd07dfb63..3864bd876ea776b21cba6d2f17253767d7bea906 100644 GIT binary patch delta 93 zcmZ3(yM}i{1=mv^4h}Q!Sx5d@ZEU*4Ds5z_YiOivU=dv7=;)bTNxW$85n3A7y`-bjBDOb a&Sw)-$05HgMkJ5{2s~Z=T-G@yGywpxQy6ss 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 d351ba4da181f8216901fe013738a092c2cff805..7f5baa803db15503e31711f4e1cf19acd37ab831 100644 GIT binary patch delta 110 zcmeBY>t~zL%k`9pgTst_){#F}8>cHUMHm_C8XD;uScDi@Secqw85-&u7+4t?Jolfz sf`NfSwZt`|BqgyV)hahXB{Qv(!N>rIhG|0jB0vocp00i_>zopr0Pjg1`~Uy| delta 110 zcmeBY>t~zL%k_X=m{(3q*Y1Pl#_0-75r$^E2IjhkmLZ15R>lTaCPvx@Mpgy}5);ZR s7#J8-OI#yLQW8s2t#b2IGSeymdKI;Vst0BkND@c;k- 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 c95da32d352df28f89fe96c15b00946292c5e91c..55aa57f760c28a4b1c3a6463d8253a781f38cfca 100644 GIT binary patch delta 110 zcmeyx{)>G=1=mv^4h}Q!Sx5d@ZER9tjxaLRH8j#Sum~}*urf8VGBngRFt9Q(cG=1=j;^CSFB`X1;SA8=DlEBMi-S4Gnb-j6w{Jt&EMW3=Fgl41wfz#x-vl r7#LJbTq8z79$b})WG2B>gTe~DWM4fyZ{}w 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 2f3eae1a636b518ac8c706e9b20ef96272d8963f..409a005332033f124cb3411eeadc261c03db89bf 100644 GIT binary patch delta 110 zcmbQpF_B|J1=mv^4h}Q!Sx5d@ZEP}UjxaLRH8j#Sum~}*urf8VGBngRFt9Q(cz79$b})WG2B>gTe~DWM4fYnvSW 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 5353eee7e8092521fdba6b836843034356b06923..cb312acc6d72e0ba8b64069d09f2fb5b5c07047f 100644 GIT binary patch delta 110 zcmdnWvXx~*FV|BZ4h}Q!Sx5d@ZJh4L7-3|nYiOivU=dhQ5Mi`pu8kp-ET80=JTNxWznHXss7+Dz@NK7cN sU|?WSEpd$~Nl7e8waU#;$xN$cFfzcQA@l6{BR~xdp00i_>zopr0GI+EUH||9 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 0783e85c6f4aa582ae8dd3a26eb5c72119c441ae..9256e1bd8adb7596bdf2345e67addfc8970c3c77 100644 GIT binary patch delta 93 zcmdnZvYTZ>FV|BZ4h}Q!Sx5d@ZJh4IC~ah@YiOivU=dN#nf@gPZQD?VE_V8S3j3^P6FV_QhVO}{cUAqsG8>jm)N*kK#8kp-ET80=JTNxWznHXss7+Dz@NK7cN bnEa1XOdW@O=GpT{7=Xaj)z4*}Q$iB}w!|5h 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 9483ceb6f66693753b9dbe83a827a5de15d21bd3..0fa819516fe9f26d75bbbe8c94acc5cf09b776ae 100644 GIT binary patch delta 93 zcmbQkHivCO1=mv^4h}Q!Sx5d@ZESL4k~T8bH8j#Sum~}*urf8VGBngRFt9Q(cG14|LvNAA`m{4B9 sz`&qd;u=wsl30>zm7AZEnO4bQWPn3M=GpT{fEpM)UHx3vIVCg!0JmWt$^ZZW 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 bca7714111774bec98b4a87d7cb5c381eede2129..545514c63d1cab281a5bb4f46fa7e749e9b342f1 100644 GIT binary patch delta 109 zcmdnRyo-54FV|BZ4h}Q!Sx5d@O`Lu@!pKn9&`8(7BE-PL%GAWl&`{UFz{G14|LvNAA`m{4B9 sz`&qd;u=wsl30>zm7AZEnO4bQWPn3M=GpT{fEpM)UHx3vIVCg!0JmWt$^ZZW 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 9caa62be16f1c9ecef7c0130e703b99249491642..1a7c606ede122f8baef36c8b6790b8a25bed5969 100644 GIT binary patch delta 110 zcmbQqHz79$b})WG2B>gTe~DWM4fdtn_T 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 f2f1de9e9d2c0e1558f4c795efa9371a4bb183c8..8b7cd6474878f81bcb1278a68837b0e0aa79eaf8 100644 GIT binary patch delta 110 zcmdnRzKeZAFV|BZ4h}Q!Sx5d@ZJd6ZDZgRUiZC?OH89sTvd$=Mi`pu8kp-ET80=JTNxWznHXss7+Dz@NK7cN sU|?WSEpd$~Nl7e8waU#;$xN$cFfzcQA@l6{BR~xdp00i_>zopr0MuL_^Z)<= 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 fa00f4fce646958807479472de68a95c5ac44eb2..ccf324dedcf927410f4f73e17228a56d5590730f 100644 GIT binary patch delta 110 zcmcb{d5v>I1=mv^4h}Q!Sx5d@ZEX6(9ARXrYiOivU=dI1=j;^CSFB`X1;SA8=L+xM;Myv8XD>v7=;)bTNxW$85n3A7y`-bjBDO9 rFfgc=xJHzuB$lLF<>sekrd2W+8Q{>cEJh>{sDZ)L)z4*}Q$iB}?K~b$ 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 c89978907d0827713ef3332d20e4ac7ddcf5c458..ed5df80974efa8e337db2ee32e907440ce6fd9f8 100644 GIT binary patch delta 110 zcmZ3_v7Tc>1=mv^4h}Q!Sx5d@ZEOl1=j;^CSFB`X1;SA8=FFzBMi-S4Gnb-j6w{Jt&EMW3=Fgl41wfz#x-vl r7#LJbTq8z79$b})WG2B>gTe~DWM4fkI@}g 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 25ad0f4a31906d0d7f13f55e2ed4e174aa365a48..5ad40b17c72ef6c28f44789fc8026ace9f5fc338 100644 GIT binary patch delta 110 zcmZ3+v5aFv1=mv^4h}Q!Sx5d@ZEW&kjxaLRH8j#Sum~}*urf8VGBngRFt9Q(cz79$b})WG2B>gTe~DWM4fg!COd 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 117a2d4a4715551e735a14ac0a79d40c9affab8a..bf0892e6b6e8314232761895afbab063b27fad84 100644 GIT binary patch delta 110 zcmcc4bDd{G1=mv^4h}Q!Sx5d@ZEUJ#jW9CQH8j#Sum~}*urf8VGBngRFt9Q(cz79$b})WG2B>gTe~DWM4f#4R1z 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 42df5f411136270482f7af50e8553832e36b7769..a6e87db4205899e703d683e0d64408be3779fb2e 100644 GIT binary patch delta 110 zcmey*{GWM3FV|BZ4h}Q!Sx5d@ZJaK^7-3|nYiOivU=do9v delta 110 zcmey*{GWM3FV_QhVO}{cUAqsG8>b5}Mi`pu8kp-ET80=JTNxWznHXss7+Dz@NK7cN sU|?WSEpd$~Nl7e8waU#;$xN$cFfzcQA@l6{BR~xdp00i_>zopr0K)tpx&QzG 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 bde67727d775326b472106b5e0a82f7744de2fc9..43e4ffa652e41244a11eb24a8c2f9977c181b4f6 100644 GIT binary patch delta 110 zcmeyx{EK-)FV|BZ4h}Q!Sx5d@ZJf@{7-3|nYiOivU=de$KMi`pu8kp-ET80=JTNxWznHXss7+Dz@NK7cN sU|?WSEpd$~Nl7e8waU#;$xN$cFfzcQA@l6{BR~xdp00i_>zopr0KD@as{jB1 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 e363764e3d0886333a3b03b04f5502d4cd79d133..39f2a1245dc63c802dee2c2ca1837cda22665706 100644 GIT binary patch delta 110 zcmey$`jvG;FV|BZ4h}Q!Sx5d@ZJf@=6k%kjYiOivU=dh1|MHrgt8kp-ET80=JTNxWznHXss7+Dz@NK7cN sU|?WSEpd$~Nl7e8waU#;$xN$cFfzcQA@l6{BR~xdp00i_>zopr0J!uXp#T5? 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 1c802f594a4cd15fc239423ea2b1208120814fec..1271ccf05657826f50fb68041d2d1b4b9d0f62b4 100644 GIT binary patch delta 85 zcmZ3;zL0%FFV|BZ4h}Q!Sx5d@ZJgfAByD7Yhb2pWEf&#X=Pw!Wo)DkBn=GiS8~sr SY|ku)OMacoW~Ipm%!U9OtQQ>s 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 2d0297731b2551c8463233b7190f92f01682f0e8..eec3bc11c247e7f6c8dfe85bd3e909a808d3c2fb 100644 GIT binary patch delta 102 zcmaFL_LOZxFV|BZ4h}Q!Sx5d@ZJZv+2Yhb2pWEf&#X=Pw!Wo)DkBn=GiS8~r| kU|>)!ag8WRNi0dV%FR#7OsixtGQgo>oyumV$tKK(04VPq!Tzm7AZEnO4bQWPn4%I+e{zlee-O0svW`9n=5- 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 de4eedf6572063a79d9a3ed21479e20d0e83532b..93a52d8df88669aac2297dcd2829c9be3b0f6287 100644 GIT binary patch delta 102 zcmX@YdxUpFFV|BZ4h}Q!Sx5d@ZJfS=)yK$C*U(7Uz#_!J!phXd%Fs~Pz`)AD;JN?w m6$}gvswJ)wB`Jv|saCo9DVb@N3`PbxG)xoH7nwYn%@6=;OdVzb delta 102 zcmX@YdxUpFFV_P$QBEcWlXzm7AZEnO4bQWPn4%I+e{zlP9wo0su8b9Z~=Q 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 594f0d3394355b3eeafdd9969023066a9c871a55..8c6b642c39ca2574a4b0affc4023fcac038417dc 100644 GIT binary patch delta 102 zcmZ3-vyNv%FV|BZ4h}Q!Sx5d@ZJaK}>SJW6YiOivU=dSJi8Yhb2pWEf&#X=Pw!Wo)DkBn=GiS8~r| kU|>)!ag8WRNi0dV%FR#7OsixtGQgo>oyumV$$wc50rRRH_W%F@ 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 1e23a0b2d9d529ef2c443753551521d45261b37f..2f66e4dd1dcca06377c7ad449a1abbdbe0d2c938 100644 GIT binary patch delta 102 zcmaFE^M+?aFV|BZ4h}Q!Sx5d@ZJZv#>SJW6YiOivU=dSJi8Yhb2pWEf&#X=Pw!Wo)DkBn=GiS8~r| kU|>)!ag8WRNi0dV%FR#7OsixtGQgo>oyumV$<}O!05*FZ@Bjb+ 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 42d94a91ac7ebe5ac3422bb025f70ee54379b71a..2965cbaf240e3e1e7a583f27ffdb15e636417a3a 100644 GIT binary patch delta 102 zcmZn{Y8RT&%k`9pgTst_){#F}8>fF}_c1cmH8j#Sum~}*urf8VGBngRFt9Q(cfF}_c1inH89gPG7K@Wv@$TVGB(l%k_HC%E4k+} kFfgc=xJHzuB$lLF<>sekrd2W+8Q{>cPGz&wYhb2pWEf&#X=Pw!Wo)DkBn=GiS8~sr Tyq`%7m;5@F%}SF$Fc|^>3*r}< 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 8baeaa4b885a20881936df3272c52a99de7692f5..f2910a5e1dffa229af21341fcf94f32df20ffdd5 100644 GIT binary patch delta 85 zcmcb}c9CsDFV|BZ4h}Q!Sx5d@ZJch)ByD7Yhb2pWEf&#X=Pw!Wo)DkBn=GiS8~sr S{GLe+m;5@F%}SFMm<<6t||)!ag8WRNi0dV%FR#7OsixtGQgo>oyumV$uF4=0oh_4n*aa+ diff --git a/src/ninesurvey-1.0/public/themes/look.png b/src/ninesurvey-1.0/public/themes/look.png index 6d82761e34706264b65f3f5fc5c23afb76a67b8e..947a6569b319febfc8d4e8647f08a5402d60c2da 100644 GIT binary patch delta 22 ecmX>de>#3cAO|N82ZtH=tRsJ{Hb-$3ssjLF1_%WJ delta 22 dcmX>de>#3cAO|OtIFA;ij;bW@<|vLrbpTLo1=|1s diff --git a/src/ninesurvey-1.0/public/themes/nineblue/look.png b/src/ninesurvey-1.0/public/themes/nineblue/look.png index de2c7d01ddd238ecb9ef501b15b736d0a68d7855..e506cb3f628fe8ef1a1fdc24b7207a00761a8d4a 100644 GIT binary patch delta 24 gcmZ3wfpO^u#tmP%Ie9oZ%(!PA`D3;DFSmvd0C>j0_%C3!dh<<{^40B9`-TL1t6 diff --git a/src/ninesurvey-1.0/public/themes/ninedark/look.png b/src/ninesurvey-1.0/public/themes/ninedark/look.png index 51a68cfd1cdf91c67f27303a02a5a6626f24435a..498913d55ff222441d4ef87e640bea41d124ef7c 100644 GIT binary patch delta 24 gcmZ4SgK@t<8 diff --git a/src/ninesurvey-1.0/public/themes/ninegray/look.png b/src/ninesurvey-1.0/public/themes/ninegray/look.png index 4c04680232ab14a929b47631193171b5a9227314..e85d3366eafba6f9958c1a7374a0d7261be3950e 100644 GIT binary patch delta 24 gcmezOm+{|U#tod@oID&HX56!m{IS|B#Qmli0E5E`<^TWy delta 24 gcmezOm+{|U#tod@oJ`_8T8uiXlDwORxZe~50COn^yZ`_I diff --git a/src/ninesurvey-1.0/public/themes/ninegreen/look.png b/src/ninesurvey-1.0/public/themes/ninegreen/look.png index b38f733295200a925d33680af5a6f354019910fb..dcc2cd9f30a64648c6cf923a6c020aa112cc61dc 100644 GIT binary patch delta 24 gcmX?nit+F%#toIcoID&HX56!m{IS~H#CtFt0C~3wrvLx| delta 24 gcmX?nit+F%#toIcoJ`_8T8uiXlDwOncn^jH0BIcueE0_%C3!a=;@emY0B)%W6951J diff --git a/src/ninesurvey-1.0/public/themes/ninered/look.png b/src/ninesurvey-1.0/public/themes/ninered/look.png index 4557309ffdc1210e535f56cd78eb191e922b0e73..b53c23de7aec092fd529175cfd5f0d3dfef49d9b 100644 GIT binary patch delta 24 gcmX@Ko$=6i#trMaIe9oZ%(!PA`D3+t2RBy$0C_A4DF6Tf delta 24 gcmX@Ko$=6i#trMaIhn+Hv>0_%C3!dR;N}Vd0BDj1{{R30 diff --git a/src/ninesurvey-1.0/public/themes/nineyellow/look.png b/src/ninesurvey-1.0/public/themes/nineyellow/look.png index 49a9118d7c730243c412aa4a6218c12bb3d3b4ac..086a19ba7193e025757070ae11333aa714bba7be 100644 GIT binary patch delta 24 gcmccggYnW2#tjd+Ie9oZ%(!PA`D3;DC3j{40E@~BtN;K2 delta 24 gcmccggYnW2#tjd+Ihn+Hv>0_%C3!c$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 %} -