From 23841c6aff0e1599f50f4e5c08387bfbbec31d2b Mon Sep 17 00:00:00 2001 From: coderkun Date: Fri, 4 Jul 2014 13:54:57 +0200 Subject: [PATCH] implement CRUD for Quest texts (issue #36) --- agents/intermediate/QuestsAgent.inc | 9 + configs/AppConfig.inc | 20 +- controllers/QuestsController.inc | 223 ++++++++++++++++++++ locale/de_DE/LC_MESSAGES/The Legend of Z.mo | Bin 19958 -> 20170 bytes locale/de_DE/LC_MESSAGES/The Legend of Z.po | 72 ++++--- models/MediaModel.inc | 3 + models/QuesttextsModel.inc | 115 +++++++--- views/html/quests/edittexts.tpl | 64 ++++++ views/html/quests/quest.tpl | 1 + 9 files changed, 441 insertions(+), 66 deletions(-) create mode 100644 views/html/quests/edittexts.tpl diff --git a/agents/intermediate/QuestsAgent.inc b/agents/intermediate/QuestsAgent.inc index 4afacc3c..4279181b 100644 --- a/agents/intermediate/QuestsAgent.inc +++ b/agents/intermediate/QuestsAgent.inc @@ -68,6 +68,15 @@ } + /** + * Action: edittexts. + */ + public function edittexts(\nre\core\Request $request, \nre\core\Response $response) + { + $this->addSubAgent('Questgroupshierarchypath', 'index', $request->getParam(3), $request->getParam(4), true); + } + + /** * Action: delete. */ diff --git a/configs/AppConfig.inc b/configs/AppConfig.inc index 6d4e7aa6..056860be 100644 --- a/configs/AppConfig.inc +++ b/configs/AppConfig.inc @@ -240,11 +240,11 @@ array('^questgroups/([^/]+)/create/?$', 'questgroups/create/$1', true), array('^questgroups/([^/]+)/([^/]+)/(edit|edittexts|delete|moveup|movedown)/?$', 'questgroups/$3/$1/$2', true), array('^questgroups/([^/]+)/([^/]+)/?$', 'questgroups/questgroup/$1/$2', true), - array('^quests/([^/]+)/?$', 'quests/index/$1', true), - array('^quests/([^/]+)/all/?$', 'quests/index/$1/all', true), - array('^quests/([^/]+)/([^/]+)/(create|createmedia)/?$', 'quests/$3/$1/$2', true), - array('^quests/([^/]+)/([^/]+)/([^/]+)/(submissions|edit|delete)/?$', 'quests/$4/$1/$2/$3', true), - array('^quests/([^/]+)/([^/]+)/([^/]+)/(submission)/([^/]+)/?$', 'quests/$4/$1/$2/$3/$5', true), + array('^quests/([^/]+)/?$', 'quests/index/$1', true), + array('^quests/([^/]+)/all/?$', 'quests/index/$1/all', true), + array('^quests/([^/]+)/([^/]+)/(create|createmedia)/?$', 'quests/$3/$1/$2', true), + array('^quests/([^/]+)/([^/]+)/([^/]+)/(submissions|edit|edittexts|delete)/?$', 'quests/$4/$1/$2/$3', true), + array('^quests/([^/]+)/([^/]+)/([^/]+)/(submission)/([^/]+)/?$', 'quests/$4/$1/$2/$3/$5', true), array('^quests/(?!(index|create|createmedia))/?', 'quests/quest/$1', true), array('^characters/([^/]+)/(register|manage)/?$', 'characters/$2/$1', true), array('^characters/([^/]+)/?$', 'characters/index/$1', true), @@ -287,11 +287,11 @@ array('^questgroups/create/(.*)$', 'questgroups/$1/create', true), array('^questgroups/questgroup/(.*)$', 'questgroups/$1', true), array('^questgroups/(edit|edittexts|delete|moveup|movedown)/(.*)$', 'questgroups/$2/$1', true), - array('^quests/index/(.+)$', 'quests/$1', true), - array('^quests/quest/(.*)$', 'quests/$1', true), - array('^quests/(create|createmedia)/(.*)$', 'quests/$2/$1' , true), - array('^quests/(submissions)/(.*)$', 'quests/$2/$1', true), - array('^quests/(submission|edit|delete)/([^/]+)/([^/]+)/([^/]+)/([^/]+)$', 'quests/$2/$3/$4/$1/$5', true), + array('^quests/index/(.+)$', 'quests/$1', true), + array('^quests/quest/(.*)$', 'quests/$1', true), + array('^quests/(create|createmedia)/(.*)$', 'quests/$2/$1' , true), + array('^quests/(submissions)/(.*)$', 'quests/$2/$1', true), + array('^quests/(submission|edit|edittexts|delete)/([^/]+)/([^/]+)/([^/]+)/([^/]+)$', 'quests/$2/$3/$4/$1/$5', true), array('^characters/(index|character)/(.*)$', 'characters/$2', true), array('^characters/(register|manage)/([^/]+)$', 'characters/$2/$1', true), array('^characters/(edit|delete)/([^/]+)/([^/]+)$', 'characters/$2/$3/$1', true), diff --git a/controllers/QuestsController.inc b/controllers/QuestsController.inc index 3c3f05c9..fc1ad610 100644 --- a/controllers/QuestsController.inc +++ b/controllers/QuestsController.inc @@ -43,6 +43,7 @@ 'submission' => array('admin', 'moderator', 'user'), 'create' => array('admin', 'moderator', 'user'), 'edit' => array('admin', 'moderator', 'user'), + 'edittexts' => array('admin', 'moderator', 'user'), 'delete' => array('admin', 'moderator', 'user') ); /** @@ -57,6 +58,7 @@ 'submission' => array('admin', 'moderator'), 'create' => array('admin', 'moderator'), 'edit' => array('admin', 'moderator'), + 'edittexts' => array('admin', 'moderator'), 'delete' => array('admin') ); @@ -769,6 +771,227 @@ } + /** + * Action: edittexts. + * + * Edit the texts of a Quest of a Seminary. + * + * @throws IdNotFoundException + * @param string $seminaryUrl URL-Title of Seminary + * @param string $questgroupUrl URL-Title of Questgroup + * @param string $questUrl URL-Title of Quest + */ + public function edittexts($seminaryUrl, $questgroupUrl, $questUrl) + { + // Get Seminary + $seminary = $this->Seminaries->getSeminaryByUrl($seminaryUrl); + + // Get Questgroup + $questgroup = $this->Questgroups->getQuestgroupByUrl($seminary['id'], $questgroupUrl); + $questgroup['hierarchy'] = $this->Questgroupshierarchy->getHierarchyForQuestgroup($questgroup['id']); + $questgroup['picture'] = (!is_null($questgroup['questgroupspicture_id'])) ? $this->Media->getSeminaryMediaById($questgroup['questgroupspicture_id']) : null; + + // Get Quest + $quest = $this->Quests->getQuestByUrl($seminary['id'], $questgroup['id'], $questUrl); + + // Get Questtexts + $questtextTypes = $this->Questtexts->getQuesttexttypes(); + foreach($questtextTypes as &$questtextType) + { + $questtextType['texts'] = $this->Questtexts->getQuesttextsOfQuest($quest['id'], $questtextType['url']); + foreach($questtextType['texts'] as &$questtext) + { + if(!is_null($questtext['questsmedia_id'])) { + $questtext['media'] = $this->Media->getSeminaryMediaById($questtext['questsmedia_id']); + } + } + } + + // Get allowed mimetypes + $mimetypes = \nre\configs\AppConfig::$mimetypes['moodpics']; + + // Check request method + $validations = array(); + if($this->request->getRequestMethod() == 'POST' && !is_null($this->request->getPostParam('edit'))) + { + $media = $_FILES['media']; + $texts = $this->request->getPostParam('questtexts'); + $deleteTexts = $this->request->getPostParam('deletes'); + if(!is_array($deleteTexts)) { + $deleteTexts = array(); + } + + foreach($questtextTypes as &$type) + { + // Edit or delete texts + if(!array_key_exists($type['url'], $texts)) { + continue; + } + foreach($type['texts'] as &$text) + { + if(array_key_exists($type['url'], $deleteTexts) && array_key_exists($text['id'], $deleteTexts[$type['url']])) + { + // Delete text + $this->Questtexts->deleteQuesttext($text); + //unset($texts[$type['url']][$text['id']]); + } + elseif(array_key_exists($type['url'], $texts) && array_key_exists($text['id'], $texts[$type['url']])) + { + // Edit text + $this->Questtexts->editQuesttext($text['id'], $texts[$type['url']][$text['id']]); + + // Validate medium + $medium = null; + $validation = true; + if(!empty($media) && array_key_exists($type['url'], $media['error']) && array_key_exists($text['id'], $media['error'][$type['url']]) && $media['error'][$type['url']][$text['id']] != UPLOAD_ERR_NO_FILE) + { + $medium = array( + 'name' => $media['name'][$type['url']][$text['id']], + 'tmp_name' => $media['tmp_name'][$type['url']][$text['id']], + 'type' => $media['type'][$type['url']][$text['id']], + 'size' => $media['size'][$type['url']][$text['id']], + 'error' => $media['error'][$type['url']][$text['id']] + ); + + // Check error + if($medium['error'] !== UPLOAD_ERR_OK) { + $validation = $this->Validation->addValidationResult($validation, 'media', 'error', $medium); + } + + // Check mimetype + $mediaMimetype = null; + $medium['mimetype'] = \hhu\z\Utils::getMimetype($medium['tmp_name'], $medium['type']); + foreach($mimetypes as &$mimetype) { + if($mimetype['mimetype'] == $medium['mimetype']) { + $mediaMimetype = $mimetype; + break; + } + } + if(is_null($mediaMimetype)) { + $validation = $this->Validation->addValidationResult($validation, 'media', 'mimetype', $medium['mimetype']); + } + elseif($medium['size'] > $mediaMimetype['size']) { + $validation = $this->Validation->addValidationResult($validation, 'media', 'size', $mediaMimetype['size']); + } + } + $validations[$type['url']][$text['id']] = $validation; + + // Upload medium + if(!is_null($medium) && $validation === true) + { + $questsmediaId = $this->Media->createQuestMedia( + $this->Auth->getUserId(), + $seminary['id'], + sprintf('questtext-%d-%d', $quest['id'], $text['id']), + $medium['name'], + $medium['type'], + $medium['tmp_name'] + ); + if($questsmediaId > 0) { + $this->Questtexts->setQuestmedia($text['id'], $questsmediaId); + } + } + + // Remove text from list + //unset($texts[$type['url']][$text['id']]); + } + } + + // Add new text + if(array_key_exists($type['url'], $texts) && array_key_exists('new', $texts[$type['url']])) + { + $text = $texts[$type['url']]['new']; + if(!empty($text)) + { + // Add text + $questtextId = $this->Questtexts->addQuesttextToQuest( + $this->Auth->getUserId(), + $quest['id'], + $type['url'], + $text + ); + + // Validate medium + $medium = null; + $validation = true; + if(!empty($media) && array_key_exists($type['url'], $media['error']) && array_key_exists('new', $media['error'][$type['url']]) && $media['error'][$type['url']]['new'] != UPLOAD_ERR_NO_FILE) + { + $medium = array( + 'name' => $media['name'][$type['url']]['new'], + 'tmp_name' => $media['tmp_name'][$type['url']]['new'], + 'type' => $media['type'][$type['url']]['new'], + 'size' => $media['size'][$type['url']]['new'], + 'error' => $media['error'][$type['url']]['new'] + ); + + // Check error + if($medium['error'] !== UPLOAD_ERR_OK) { + $validation = $this->Validation->addValidationResult($validation, 'media', 'error', $medium); + } + + // Check mimetype + $mediaMimetype = null; + $medium['mimetype'] = \hhu\z\Utils::getMimetype($medium['tmp_name'], $medium['type']); + foreach($mimetypes as &$mimetype) { + if($mimetype['mimetype'] == $medium['mimetype']) { + $mediaMimetype = $mimetype; + break; + } + } + if(is_null($mediaMimetype)) { + $validation = $this->Validation->addValidationResult($validation, 'media', 'mimetype', $medium['mimetype']); + } + elseif($medium['size'] > $mediaMimetype['size']) { + $validation = $this->Validation->addValidationResult($validation, 'media', 'size', $mediaMimetype['size']); + } + } + $validations[$type['url']]['new'] = $validation; + + // Upload medium + if(!is_null($medium) && $validation === true) + { + $questsmediaId = $this->Media->createQuestMedia( + $this->Auth->getUserId(), + $seminary['id'], + sprintf('questtext-%d-%d', $quest['id'], $questtextId), + $medium['name'], + $medium['type'], + $medium['tmp_name'] + ); + if($questsmediaId > 0) { + $this->Questtexts->setQuestmedia($questtextId, $questsmediaId); + } + } + } + } + + // Reload texts + $type['texts'] = $this->Questtexts->getQuesttextsOfQuest($quest['id'], $type['url']); + foreach($type['texts'] as &$questtext) + { + if(!is_null($questtext['questsmedia_id'])) { + $questtext['media'] = $this->Media->getSeminaryMediaById($questtext['questsmedia_id']); + } + } + } + } + + + // Set titile + $this->addTitleLocalized('Edit Quest texts'); + $this->addTitle($seminary['title']); + + // Pass data to view + $this->set('seminary', $seminary); + $this->set('questgroup', $questgroup); + $this->set('quest', $quest); + $this->set('questtexttypes', $questtextTypes); + $this->set('mimetypes', $mimetypes); + $this->set('validations', $validations); + } + + + /** * Action: delete. * diff --git a/locale/de_DE/LC_MESSAGES/The Legend of Z.mo b/locale/de_DE/LC_MESSAGES/The Legend of Z.mo index 93d0ec1a91d1313f675a3c6b6dee49a25e10e046..0cb7d3bdf9799bebcbad59989e9ca246fac12652 100644 GIT binary patch delta 6538 zcmex1oAK0K#`=3gEK?a67#P$U85m?37#Ko085nvQ85nwmK%xu`2P7C6I2afh4oWaE za56A3oPzSNNH8$SF)%RPm0)1tW?*3WBf-ER&cMLHA<4j?&A`B*Aj!bM!@$7cBgw$P z$H2f4DGAY^A<4i1GP+0-Y+pS?t0csNMUo5*tPBhctDy=uN-{9;GB7Y4kz`Gf)oRTECT~Wz7zw476SuA zuM`7=7y|>t4k-V;6vTnQq(J7?Gcc%0Lo`@RGcY8ATq@1Lz{SA8uv?mefsKKI;g~c7 z13Lo)!&xYORT|>6yV48{MhpxLub}E=Wgrevkzrs^Vqjn}mVr1lOa`JpU50@{kb!}r zM23Munt_3#O@@I%sGfm=VUY~P0b6Al7=#%Z7%s~&FeoxGFg%xGV31&7VBnO67^EZ% z;Ty{`Fo=SJRu-Z@NtS_upMim)OcvxL28K3S1_nt628P*C@vTt(M`a=QT$6=3=!+}^ zLp{hvjB*ec3ClrTs4oXG&`}N&w}DVPRt^%!nR1Y*X_SNbxF4#2o*cwMyW}7tcuo%D z@S9NcUdcfm{!0$xKmmD%da#eRUi)PPBfkdT?H2+2mvq4K*FAwD~(2nosCiVzRIR)hrkU#NOv zC5X7162zhP7D`YTDM2jqR)RPvND1QdC?$x6sZjBJB}mYfD?x&MiW0=aElQAVdIW0T zeI-a#K2?Gw=FduykP}sgq!B4)1_lKNhI$4)Wr$1sAp#6B$`B2;%8-0JA1c318Dha< zD1A>E5~n|*1`4S__-ZPUL}{-AG1pH864cQukdR1$idTX8^$ZN{Pz7^U7{CR~G8F~} z6$S=|?JAH0<_=gP0|S#PBxEF1At9ik3JC#QRY(ZLszP!{E>vBsDg%Qur~rb>Z-nv> zszS_vs>;B?2Fm|jYLF-pRD(D`Tn!TR8fuX2XRHRv*Y;|VxC>E(L{*v^Bx-WiAPy*3 zg9L568pNlwq5O?d`luQtglZ59>JW#;K=oy)Lp+cRrHj=eiL+82;-DUNh=&$H&0P((XSX^-J%c3!1H)l;1_pfw z28O@t3=Fmm3=Fy&3=D1z3=G*C3=BF93=Eqz7#Iv07#QwrFfdp%Ffa&eLioO#5PkKU z3=9Sg3=HcvAr60_331>DO^65nK>4g%kPs7u($ZS>5CK&!NYLwRK{PsOK|;bu3lfJR zS`dRPp!^OkNF1)wf`r^fEpTdPxTXcEjJ|6zFsL&yFvw{`LdH!Sk|=$&Aw_VsHY9OZ z)@ws*sR`PUT4}d7#39eMA&KjUHYCm@bRZ#NsKdaZ%fP@8rvph7JvxxwvQP(--3~+f z7j+<&&}SWp#bUY;T2&X4NKJGh4zKsog#>k=E+nXCKou<1h4^r%F2q6ip#1l`kX#|6 z2l1Je9wY=E^dS1Z^dNB^tjEB>405O*q@9qY2MO6mDBY{az@Q1r|1Dt1+Y?I&KV6_XH~b-x!h>1Wh32fV>GL~m@zPzGcYhTn?Ztlw;9C117?uyblnUR zxBtu_J`pm9_)N(hB5q+0@sW=?Bx+L4A!(|_9HPF*9Fpzkm_u^SE^~-O&zsjn40;8X zV6cD~Bx(UMSkD4dk~vvGf;<$;Plw7^SwJl8vw#>p7b?C9Dt^oY5|US;`X5_BqVg+L zJyX3U#3FG^hymJ`5C=I}LR=VT2}%8hQ1K>9NXX2vghbhTsQ789_(Q1rAC?fGb6P>n zm$ZU7MAr(EXsw}iy^|HhAWthu36^RFDUjN%AP(4Q1#!R`D@cKI7fOT5VNkPL*&0&P zSy@AZJjogoVpY}SVBkSjc4uu}IDi5;cZ)ko@gt2XSD69mJq=sJeDLhy}CkAU<4Z z2XW9UJCH>T3|s9W<{z?yIQWbm1A`nW|KGA>V6b6eVEAbVajBU-Buc{UAwDd!hXief zJtU|n*n@+PVTV1$;d|{N<;M+sh{OKcLvoFX1BAAAfF#l+2Z+Um4iJaeJ1{WRgL)$U z4iF1gJ3tIL3{`N;0TKnT93VdV1~rJ$5n{1`BP4{h9U%_4bAbrWpjc!K-US9UtOFa1xJz-#OGN~kSLhs1g<<7)9shNLl`dKZWV3N8?r>$^Z4WD2Ei zTp&Jic7ddc2&lRe7l==)Tp$i_b%B(ieJ%_Prl3wMl>f(tfx(-Bfx*NTlDisQA!%*1 zD@1+$2dIRG8>C4U?Z&`h1!}drLE`p=8ziW1yFo(cwHqWPenM$3cZj^SJH$cS?hp@| zxkEzA)g9tMe|H834F(2=2zN-@X>cSw+Za)(qdzuX~}kCq3dVDj^T zgiyW*#DY=}NUCpv%CGc*v;j{+>E9j@hw6Aj(w40!qyS6tgoH#pn677F*yRZc+P9vN zmJO#DBsb`LK@y!il+O2p)D6?UAc<-NRNWpgh!3xLF)##yMnt?IiOs+pVxg@!r0JI6 z4QUDWdNVNSF)%Q!0nwoRf7=^k0GAIWD206>1}OVLQoDf- zvJV5e6}`*{;_wGheLs94J{9t1VDMsKU~u(?m^Z-}V$UjH28Mc2Z+4e2B(C;D>65;Y zqV}>c#9=ReA#wW&O8v7jF$PQ{>nLqCXlW`2+;aPWiFo`F#DWIsqE&-G)d z2M-dJ_(3dc^n(O#mmkE3)BGTDy$LFR(2s$Ek%58XIAm-JOg;pY3=BR{8bn=WU|`^9 zgp?(qE*MBm8KjYcfuV+hfuRFfuS4V_;zT&cML1l!1Xk zhLM3`Jp%(nJJbw0Mh1qP43MY;*$*DAn#{n!ki@{ikj4NhND6tqLqPx z;U5D7LjY(bjDdk+IRm8GF3-ro(9OWWa1ClWh`PfZ{MHJ(~g2EZfJx!0-|@ zpvAzzP~XGA!0?6v(%?M60EtJCdTvGrhD8hv4AU4GK#d}XItB)YN1#zH(0~*p1498w z5d#B*03!oK29(Xn$iVQPfq?-upjgJhz#t6`a*#Brd$t$EU|?W)2Bksvg9ja7Kn1=q zfC~lifFY>ACkr(omH|>)xqt>Dp=v=CsH8i}z`(GHfq`Kss9(syz>vzoz@WkiNnju~ zAp96KP6#rKk%7UNfq{XKk%1urlp{dl4;rlmDFWdQAcBE`!JdJEK@Fq(GBPl1gNlN>;ARYvLMDrWfgzrOfnh#W4m2VH8sELkz`(E&Dh8rV z7#J9CfEWyr(sMckq>urP6@$iyK_jXl=|dm_)YS)#d@?|~`5^njBbQMO3=Ah37#NzM ziXK4e6b1%{DIfzGA=Tvv1_p+71_lOq1_p+83=9mJ43LryRP5e?>H$%285kI5f(D~O z90o{n3mT*bbx1)%f{Y9deGCi?TR`y-5{Lm2P@Ds$K@?~J8dO3~1m#yoNX_^PBmqhn z3=9k%P&SAH4NimT5D)>yT#O71;*1Oop$rTRr3?%V$qWn(jtmS8ehiS#En7V!0|PH3 z1H)nl28LV)28LY>3=CHp7#KD}4S-QRj0_BljF1`-Bz6xp8UhM(Mh1p=3=9lkL4r_R z!N9=4&d9(J2^y#bjixX#Ftji*Fq{XCrZX@w1T!!& z-N4Ot5~6Hu3MHu(CB>6F_3uXSm($wOT^rF&&f>e;;W=2a+cA+8#B;h=;IIF`) FUI46CoizXe delta 6367 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 diff --git a/locale/de_DE/LC_MESSAGES/The Legend of Z.po b/locale/de_DE/LC_MESSAGES/The Legend of Z.po index 76bf60f2..f11394df 100644 --- a/locale/de_DE/LC_MESSAGES/The Legend of Z.po +++ b/locale/de_DE/LC_MESSAGES/The Legend of Z.po @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: The Legend of Z\n" -"POT-Creation-Date: 2014-07-01 15:40+0100\n" -"PO-Revision-Date: 2014-07-01 15:41+0100\n" +"POT-Creation-Date: 2014-07-01 23:17+0100\n" +"PO-Revision-Date: 2014-07-01 23:17+0100\n" "Last-Translator: \n" "Language-Team: \n" "Language: de_DE\n" @@ -63,8 +63,8 @@ msgstr "Neuer Lösungsvorschlag" msgid "Character submission approved" msgstr "Lösungsvorschlag bewertet" -#: controllers/QuestsController.inc:1004 -#: questtypes/submit/html/submission.tpl:30 views/html/quests/quest.tpl:53 +#: controllers/QuestsController.inc:1107 +#: questtypes/submit/html/submission.tpl:30 views/html/quests/quest.tpl:54 #: views/html/quests/submissions.tpl:30 msgid "solved" msgstr "Richtig!" @@ -76,7 +76,7 @@ msgstr "Richtig!" msgid "lost" msgstr "verloren" -#: questtypes/bossfight/html/quest.tpl:41 views/html/quests/quest.tpl:128 +#: questtypes/bossfight/html/quest.tpl:41 views/html/quests/quest.tpl:129 msgid "Choose" msgstr "Wählen" @@ -191,7 +191,7 @@ msgstr "Bewertet von %s am %s um %s Uhr" msgid "Comment" msgstr "Kommentar" -#: questtypes/submit/html/submission.tpl:31 views/html/quests/quest.tpl:58 +#: questtypes/submit/html/submission.tpl:31 views/html/quests/quest.tpl:59 #: views/html/quests/submissions.tpl:20 msgid "unsolved" msgstr "Leider falsch!" @@ -482,7 +482,7 @@ msgstr "Motto" #: views/html/charactertypes/manage.tpl:91 views/html/library/create.tpl:46 #: views/html/library/edit.tpl:124 views/html/questgroups/create.tpl:76 #: views/html/questgroupshierarchy/create.tpl:63 -#: views/html/quests/create.tpl:110 views/html/seminaries/create.tpl:75 +#: views/html/quests/create.tpl:108 views/html/seminaries/create.tpl:75 #: views/html/users/create.tpl:96 msgid "create" msgstr "erstellen" @@ -513,9 +513,10 @@ msgstr "Soll die %s-Gruppen „%s“ wirklich gelöscht werden?" #: views/html/characters/delete.tpl:17 views/html/charactertypes/manage.tpl:48 #: views/html/library/delete.tpl:14 views/html/library/edit.tpl:83 #: views/html/questgroups/delete.tpl:17 +#: views/html/questgroups/edittexts.tpl:16 #: views/html/questgroupshierarchy/delete.tpl:14 -#: views/html/quests/delete.tpl:11 views/html/seminaries/delete.tpl:13 -#: views/html/users/delete.tpl:11 +#: views/html/quests/delete.tpl:11 views/html/quests/edittexts.tpl:22 +#: views/html/seminaries/delete.tpl:13 views/html/users/delete.tpl:11 msgid "delete" msgstr "löschen" @@ -550,8 +551,9 @@ msgstr "%s-Gruppe bearbeiten" #: views/html/charactergroups/editgroupsgroup.tpl:50 #: views/html/charactergroupsquests/edit.tpl:94 #: views/html/characters/edit.tpl:108 views/html/questgroups/edit.tpl:64 -#: views/html/questgroupshierarchy/edit.tpl:57 views/html/quests/edit.tpl:113 -#: views/html/seminaries/edit.tpl:77 +#: views/html/questgroups/edittexts.tpl:24 +#: views/html/questgroupshierarchy/edit.tpl:57 views/html/quests/edit.tpl:111 +#: views/html/quests/edittexts.tpl:32 views/html/seminaries/edit.tpl:77 msgid "edit" msgstr "bearbeiten" @@ -632,7 +634,6 @@ msgid "Add Characters" msgstr "Füge Charaktere hinzu" #: views/html/charactergroups/managegroup.tpl:59 -#: views/html/questgroups/questgroup.tpl:21 #: views/html/questgroups/questgroup.tpl:108 views/html/quests/index.tpl:9 msgid "Quests" msgstr "Quests" @@ -1157,7 +1158,7 @@ msgid "Moodpic" msgstr "Stimmungsbild" #: views/html/questgroups/delete.tpl:14 -#: views/html/questgroups/questgroup.tpl:16 +#: views/html/questgroups/questgroup.tpl:18 msgid "Delete Questgroup" msgstr "Questgruppe löschen" @@ -1170,7 +1171,16 @@ msgstr "Soll das die Questgruppe „%s“ wirklich gelöscht werden?" msgid "Edit Questgroup" msgstr "Questgruppe bearbeiten" -#: views/html/questgroups/questgroup.tpl:17 +#: views/html/questgroups/edittexts.tpl:8 +#: views/html/questgroups/questgroup.tpl:16 +msgid "Edit Questgroup texts" +msgstr "Questgruppetexte bearbeiten" + +#: views/html/questgroups/edittexts.tpl:20 views/html/quests/edittexts.tpl:27 +msgid "New Questgroup text" +msgstr "Neuer Questgruppentext" + +#: views/html/questgroups/questgroup.tpl:22 msgid "Create new Quest" msgstr "Neue Quest erstellen" @@ -1302,20 +1312,20 @@ msgstr "Das Bild ist ungültig" msgid "Picture" msgstr "Bild" -#: views/html/quests/create.tpl:103 views/html/quests/edit.tpl:106 +#: views/html/quests/create.tpl:102 views/html/quests/edit.tpl:105 msgid "Entry text" msgstr "Einstiegstext" -#: views/html/quests/create.tpl:105 views/html/quests/edit.tpl:108 -#: views/html/quests/quest.tpl:49 +#: views/html/quests/create.tpl:103 views/html/quests/edit.tpl:106 +#: views/html/quests/quest.tpl:50 msgid "Task" msgstr "Aufgabe" -#: views/html/quests/create.tpl:108 views/html/quests/edit.tpl:111 +#: views/html/quests/create.tpl:106 views/html/quests/edit.tpl:109 msgid "Wrong text" msgstr "Text für falsche Antwort" -#: views/html/quests/delete.tpl:8 views/html/quests/quest.tpl:13 +#: views/html/quests/delete.tpl:8 views/html/quests/quest.tpl:14 msgid "Delete Quest" msgstr "Quest löschen" @@ -1328,6 +1338,10 @@ msgstr "Soll die Quest „%s“ wirklich gelöscht werden?" msgid "Edit Quest" msgstr "Quest bearbeiten" +#: views/html/quests/edittexts.tpl:8 views/html/quests/quest.tpl:12 +msgid "Edit Quest texts" +msgstr "Questtexte bearbeiten" + #: views/html/quests/index.tpl:16 views/html/quests/index.tpl:23 msgid "all" msgstr "alle" @@ -1340,44 +1354,44 @@ msgstr "Questtyp" msgid "open submissions" msgstr "offene Lösungsvorschläge" -#: views/html/quests/quest.tpl:19 +#: views/html/quests/quest.tpl:20 msgid "Prolog" msgstr "Prolog" -#: views/html/quests/quest.tpl:54 +#: views/html/quests/quest.tpl:55 msgid "Quest completed." msgstr "Quest abgeschlossen." -#: views/html/quests/quest.tpl:54 +#: views/html/quests/quest.tpl:55 #, php-format msgid "You have earned %d XPs." msgstr "Du hast %d XP erhalten." -#: views/html/quests/quest.tpl:70 +#: views/html/quests/quest.tpl:71 msgid "Task already successfully solved" msgstr "Du hast die Aufgabe bereits erfolgreich gelöst" -#: views/html/quests/quest.tpl:72 +#: views/html/quests/quest.tpl:73 msgid "Show answer" msgstr "Lösung anzeigen" -#: views/html/quests/quest.tpl:82 +#: views/html/quests/quest.tpl:83 msgid "Epilog" msgstr "Epilog" -#: views/html/quests/quest.tpl:108 +#: views/html/quests/quest.tpl:109 msgid "Continuation" msgstr "Setze deine Reise fort" -#: views/html/quests/quest.tpl:115 views/html/quests/quest.tpl:131 +#: views/html/quests/quest.tpl:116 views/html/quests/quest.tpl:132 msgid "Quest" msgstr "Quest" -#: views/html/quests/quest.tpl:133 +#: views/html/quests/quest.tpl:134 msgid "Go on" msgstr "Fortfahren" -#: views/html/quests/quest.tpl:142 views/html/seminaries/seminary.tpl:52 +#: views/html/quests/quest.tpl:143 views/html/seminaries/seminary.tpl:52 msgid "Let’s go" msgstr "Auf ins Abenteuer!" diff --git a/models/MediaModel.inc b/models/MediaModel.inc index ca709c19..b02f51a1 100644 --- a/models/MediaModel.inc +++ b/models/MediaModel.inc @@ -270,6 +270,9 @@ $this->db->rollback(); $mediaId = false; } + else { + $this->db->commit(); + } } catch(\nre\exceptions\DatamodelException $e) { $this->db->rollback(); diff --git a/models/QuesttextsModel.inc b/models/QuesttextsModel.inc index a1a144a0..b66eb284 100644 --- a/models/QuesttextsModel.inc +++ b/models/QuesttextsModel.inc @@ -64,7 +64,7 @@ if(is_null($questtexttypeUrl)) { return $this->db->query( - 'SELECT questtexts.id, questtexts.text, questtexts.pos, questtexts.out_text, questtexts.abort_text, questtexts.questsmedia_id, questtexttypes.id AS type_id, questtexttypes.type, questtexttypes.url AS type_url '. + 'SELECT questtexts.id, questtexts.quest_id, questtexts.text, questtexts.pos, questtexts.out_text, questtexts.abort_text, questtexts.questsmedia_id, questtexttypes.id AS type_id, questtexttypes.type, questtexttypes.url AS type_url '. 'FROM questtexts '. 'LEFT JOIN questtexttypes ON questtexttypes.id = questtexts.questtexttype_id '. 'WHERE questtexts.quest_id = ?', @@ -75,7 +75,7 @@ else { return $this->db->query( - 'SELECT questtexts.id, questtexts.text, questtexts.pos, questtexts.out_text, questtexts.abort_text, questtexts.questsmedia_id, questtexttypes.id AS type_id, questtexttypes.type, questtexttypes.url AS type_url '. + 'SELECT questtexts.id, questtexts.quest_id, questtexts.text, questtexts.pos, questtexts.out_text, questtexts.abort_text, questtexts.questsmedia_id, questtexttypes.id AS type_id, questtexttypes.type, questtexttypes.url AS type_url '. 'FROM questtexts '. 'LEFT JOIN questtexttypes ON questtexttypes.id = questtexts.questtexttype_id '. 'WHERE questtexts.quest_id = ? and questtexttypes.url = ?', @@ -220,44 +220,105 @@ /** - * Add a list of Questtexts to a Quest. + * Add a Questtexts to a Quest. * * @param int $userId ID of user * @param int $questId ID of Quest to add texts to * @param string $questtexttypeUrl URL-type of Questtexttype of texts - * @param array $texts List of texts to add. + * @param string $text Text to add. */ - public function addQuesttextsToQuest($userId, $questId, $questtexttypeUrl, $texts) + public function addQuesttextToQuest($userId, $questId, $questtexttypeUrl, $text) { $questtexttype = $this->getQuesttexttypeByUrl($questtexttypeUrl); if(is_null($questtexttype)) { return; } - foreach($texts as &$text) - { - $pos = $this->db->query( - 'SELECT COALESCE(MAX(pos),0)+1 AS pos '. - 'FROM questtexts '. - 'WHERE quest_id = ?', - 'i', - $questId - ); - $pos = $pos[0]['pos']; - - $this->db->query( - 'INSERT INTO questtexts '. - '(created_user_id, quest_id, questtexttype_id, pos, text) '. - 'VALUES '. - '(?, ?, ?, ?, ?)', - 'iiiis', - $userId, $questId, $questtexttype['id'], $pos, - $text - ); - } + + // Get position + $pos = $this->db->query( + 'SELECT COALESCE(MAX(pos),0)+1 AS pos '. + 'FROM questtexts '. + 'WHERE quest_id = ?', + 'i', + $questId + ); + $pos = $pos[0]['pos']; + + // Add Questtext + $this->db->query( + 'INSERT INTO questtexts '. + '(created_user_id, quest_id, questtexttype_id, pos, text) '. + 'VALUES '. + '(?, ?, ?, ?, ?)', + 'iiiis', + $userId, $questId, $questtexttype['id'], $pos, + $text + ); + + + // Return ID + return $this->db->getInsertId(); + } + + + /** + * Set the media for a Quest text. + * + * @param int $questtextId ID of Quest text to set media for + * @param int $questmediaId ID of Questsmedia to set + */ + public function setQuestmedia($questtextId, $questsmediaId) + { + $this->db->query( + 'UPDATE questtexts '. + 'SET questsmedia_id = ? '. + 'WHERE id = ?', + 'ii', + $questsmediaId, + $questtextId + ); + } + + + /** + * Edit a Quest text. + * + * @param int $questtextId ID of Quest text to edit + * @param string $text New text + */ + public function editQuesttext($questtextId, $text) + { + $this->db->query( + 'UPDATE questtexts '. + 'SET text = ? '. + 'WHERE id = ?', + 'si', + $text, + $questtextId + ); } - + /** + * Delete a Quest text. + * + * @param array $questtext Data of Quest text to delete + */ + public function deleteQuesttext($questtext) + { + // Delete Quest text + $this->db->query('DELETE FROM questtexts WHERE id = ?', 'i', $questtext['id']); + + // Adjust positions + $this->db->query( + 'UPDATE questtexts '. + 'SET pos = pos - 1 '. + 'WHERE quest_id = ? AND pos > ?', + 'ii', + $questtext['quest_id'], + $questtext['pos'] + ); + } } diff --git a/views/html/quests/edittexts.tpl b/views/html/quests/edittexts.tpl new file mode 100644 index 00000000..e5ec350e --- /dev/null +++ b/views/html/quests/edittexts.tpl @@ -0,0 +1,64 @@ + +
+ +
+ + + +

+
+ +
+ + +
    + &$validation) : ?> + + &$settings) : ?> +
  • +
      + $value) : ?> +
    • + +
      • + +
    +
    • + + + +
+ +
    + +
  • + +
    + +
    +
    + + +
    • + +
  • +
    + +
    • +
+
+ + +
diff --git a/views/html/quests/quest.tpl b/views/html/quests/quest.tpl index 6c59203b..87695b38 100644 --- a/views/html/quests/quest.tpl +++ b/views/html/quests/quest.tpl @@ -9,6 +9,7 @@ 0) : ?>