Dev: bugfixing functionality in the new adminpanel

Finished moving the breadcrums to the titlebar
Fixed saving of subviews and some minor css errors

application/config/version.php

@@ -13,7 +13,7 @@
 
 $config['versionnumber'] = '3.0.0-alpha'; //The current version of this branch
 $config['masterversion'] = '2.62.2'; //The current masters version merged into this branch
-$config['dbversionnumber'] = 293;
+$config['dbversionnumber'] = 294;
 $config['buildnumber'] = '';
 $config['updatable'] = true;
 $config['assetsversionnumber'] = '2671';

application/controllers/admin/assessments.php

@@ -113,12 +113,13 @@ private function _showAssessments($iSurveyID, $action)
         $aData['assessmentlangs'] = Yii::app()->getConfig("assessmentlangs");
         $aData['baselang'] = $surveyinfo['language'];
         $aData['action'] = $action;
+        $aData['subaction'] = gT("Assessments");
         $aData['gid'] = empty($_POST['gid']) ? '' : sanitize_int($_POST['gid']);
 
         Yii::app()->loadHelper('admin/htmleditor');
 
         $urls['output'] = '<div class="side-body ' . getSideBodyClass(false) . '">';
-        $urls['output'] .= App()->getController()->renderPartial('/admin/survey/breadcrumb', array('oSurvey'=>$oSurvey, 'active'=>gT("Assessments")), true, false);
+        //$urls['output'] .= App()->getController()->renderPartial('/admin/survey/breadcrumb', array('oSurvey'=>$oSurvey, 'active'=>gT("Assessments")), true, false);
         $urls['output'] .= '<h3>'.gT("Assessments").'</h3>';
         $aData['asessementNotActivated'] = false;
         if ($surveyinfo['assessments']!='Y')

application/controllers/admin/conditionsaction.php

@@ -106,6 +106,7 @@ public function index($subaction, $iSurveyID=null, $gid=null, $qid=null)
         $aData['sidemenu']['state'] = false;
         $surveyinfo = Survey::model()->findByPk($iSurveyID)->surveyinfo;
         $aData['title_bar']['title'] = $surveyinfo['surveyls_title']." (".gT("ID").":".$iSurveyID.")";
+        $aData['subaction'] = gT("Conditions designer");
         $aData['questionbar']['closebutton']['url'] = 'admin/questions/sa/view/surveyid/'.$iSurveyID.'/gid/'.$gid.'/qid/'.$qid;  // Close button
         $aData['questionbar']['buttons']['conditions'] = TRUE;
 

application/controllers/admin/database.php

@@ -1285,9 +1285,6 @@ private function actionInsertCopyQuestion($iSurveyID)
 
             $this->iQuestionID=0;
 
-            /** @var Question $oOldQuestion */
-            $oOldQuestion = Question::model()->findByPk(returnGlobal('oldqid'));
-
             $oQuestion= new Question;
             $oQuestion->sid = $iSurveyID;
             $oQuestion->gid = $this->iQuestionGroupID;
@@ -1362,6 +1359,11 @@ private function actionInsertCopyQuestion($iSurveyID)
 
             } else {
                 if (Yii::app()->request->getPost('action') == 'copyquestion') {
+                    /** @var Question $oOldQuestion */
+                    $oldQID = returnGlobal('oldqid');
+                    if($oldQID){
+                        $oOldQuestion = Question::model()->findByPk($oldQID);
+                    }
                     if (returnGlobal('copysubquestions') == 1) {
                         $aSQIDMappings = array();
                         $r1 = $oOldQuestion->subquestions;

application/controllers/admin/emailtemplates.php

@@ -84,6 +84,7 @@ function index($iSurveyId)
             $aData['surveybar']['closebutton']['url'] = 'admin/survey/sa/view/surveyid/'.$iSurveyId;  // Close button
 
         $aData['surveyid'] = $iSurveyId;
+        $aData['subaction'] = gT("Edit email templates");
         $aData['ishtml'] = $ishtml;
         $aData['grplangs'] = $grplangs;
         $this->_renderWrappedTemplate('emailtemplates', array('output' => $sEditScript, 'emailtemplates_view'), $aData);

application/controllers/admin/quotas.php

@@ -149,7 +149,7 @@ function index($iSurveyId, $quickreport = false)
         $oSurvey =Survey::model()->findByPk($iSurveyID);
         $surveyinfo = $oSurvey->surveyinfo;
         $aData['title_bar']['title'] = $surveyinfo['surveyls_title']." (".gT("ID").":".$iSurveyID.")";
-
+        $aData['subaction'] = gT("Survey quotas");
         //$aData['surveybar']['active_survey_properties'] = 'quotas';
         $aData['surveybar']['buttons']['view']= TRUE;
         $aData['surveybar']['active_survey_properties']['img'] = 'quota';

application/controllers/admin/surveyadmin.php

@@ -447,7 +447,7 @@ public function getAjaxQuestionGroupArray($surveyid){
             {
                 $curGroup = $group->attributes;
                 $curGroup['link'] = $this->getController()->createUrl("admin/questiongroups/sa/view", ['surveyid' => $surveyid, 'gid' => $group->gid]);
-                $group->aQuestions = Question::model()->findAllByAttributes(array("sid"=>$iSurveyID, "gid"=>$group['gid'],"language"=>$baselang), array('order'=>'question_order ASC'));
+                $group->aQuestions = Question::model()->findAllByAttributes(array("sid"=>$iSurveyID, "gid"=>$group['gid'],"language"=>$baselang, 'parent_qid'=>0), array('order'=>'question_order ASC'));
                 $curGroup['questions'] = array();
                 foreach($group->aQuestions as $question)
                 {
@@ -929,7 +929,7 @@ public function rendersidemenulink($iSurveyID, $subaction){
         $surveyinfo = Survey::model()->findByPk($iSurveyID)->surveyinfo;
 
         //@TODO add language checks here
-        $menuEntry = SurveymenuEntries::model()->find(['condition' => 'name="'.$menuaction.'"']);
+        $menuEntry = SurveymenuEntries::model()->find('name=:name', array(':name'=>$menuaction));
 
         $esrow = self::_fetchSurveyInfo('editsurvey', $iSurveyID);
 
@@ -962,6 +962,7 @@ public function rendersidemenulink($iSurveyID, $subaction){
         $aData['action'] = $menuEntry->action;
         $aData['entryData'] = $menuEntry->attributes;
         $aData['dateformatdetails'] = getDateFormatData(Yii::app()->session['dateformat']);
+        $aData['subaction'] = $menuEntry->title;  
         $aData['display']['menu_bars']['surveysummary'] = $menuEntry->title;  
         $aData['title_bar']['title'] = $surveyinfo['surveyls_title']." (".gT("ID").":".$iSurveyID.")";
         $aData['surveybar']['savebutton']['form'] = 'globalsetting';

application/controllers/admin/surveypermission.php

@@ -53,7 +53,7 @@ public function index($iSurveyID)
         App()->getClientScript()->registerScriptFile( App()->getConfig('adminscripts') . 'surveypermissions.js');
 
         $surveysecurity = "<div id='edit-permission' class='side-body " . getSideBodyClass(false) . "'>";
-        $surveysecurity .= App()->getController()->renderPartial('/admin/survey/breadcrumb', array('oSurvey'=>$oSurvey, 'active'=>gT("Survey permissions")), true, false);
+       // $surveysecurity .= App()->getController()->renderPartial('/admin/survey/breadcrumb', array('oSurvey'=>$oSurvey, 'active'=>gT("Survey permissions")), true, false);
         $surveysecurity .="<h3>".gT("Survey permissions")."</h3>\n";
         $surveysecurity .= '<div class="row"><div class="col-lg-12 content-right">';
         $result2 = Permission::model()->getUserDetails($iSurveyID);
@@ -241,7 +241,7 @@ public function index($iSurveyID)
         $aData['sidemenu']['state'] = false;
         $surveyinfo = Survey::model()->findByPk($iSurveyID)->surveyinfo;
         $aData['title_bar']['title'] = $surveyinfo['surveyls_title']." (".gT("ID").":".$iSurveyID.")";
-
+        $aData['subaction'] = gT("Survey permissions");
         $aData['surveybar']['closebutton']['url'] = 'admin/survey/sa/view/surveyid/'.$iSurveyID;  // Close button
 
         $surveysecurity .= '</div></div></div>';

application/core/Survey_Common_Action.php

@@ -267,7 +267,7 @@ protected function _renderWrappedTemplate($sAction = '', $aViewUrls = array(), $
             // Needed to evaluate EM expressions in question summary
             // See bug #11845
             LimeExpressionManager::StartProcessingPage(false,true);
-
+            $aData['debug'] = $aData;
             $this->_titlebar($aData);
             //// TODO : Move this div inside each correct view ASAP !
             echo '<div class="ls-flex-row align-items-flex-center align-content-center">';

application/extensions/bootstrap/helpers/TbHtml.php

@@ -405,7 +405,7 @@ class TbHtml extends CHtml // required in order to access the protected methods
     const ICON_MAP_MARKER = 'fa-map-marker';
     const ICON_MINUS = 'fa-minus';
     const ICON_MINUS_SIGN = 'fa-minus-sign';
-    const ICON_MOVE = 'fa-move';
+    const ICON_MOVE = 'fa-bars bigIcons';
     const ICON_MUSIC = 'fa-music';
     const ICON_NEW_WINDOW = 'fa-new-window';
     const ICON_OFF = 'fa-off';

application/helpers/update/updatedb_helper.php

@@ -1689,6 +1689,41 @@ function db_upgrade_all($iOldDBVersion, $bSilent=false) {
             $oDB->createCommand()->update('{{settings_global}}',array('stg_value'=>293),"stg_name='DBVersion'");
             $oTransaction->commit();
         }
+
+        /**
+         * Survey menue table update
+         * @since 2017-07-03
+         */
+        if ($iOldDBVersion < 294) {
+            $oTransaction = $oDB->beginTransaction();
+
+            $oDB->createCommand()->addColumn('{{surveymenu}}', 'position', "string(255) DEFAULT 'side'");
+
+            $oDB->createCommand()->truncateTable('{{surveymenu_entries}}');
+            $colsToAdd = array("id","menu_id","order","name","title","menu_title","menu_description","menu_icon","menu_icon_type","menu_class","menu_link","action","template","partial","classes","permission","permission_grade","data","getdatamethod","language","changed_at","changed_by","created_at","created_by");
+            $rowsToAdd = array(
+                array(1,1,1,'overview','Survey overview','Overview','Open general survey overview and quick action','list','fontawesome','','admin/survey/sa/view','','','','','','',NULL,'','en-GB',date('Y-m-d H:i:s'),0,date('Y-m-d H:i:s'),0),
+                array(2,1,2,'generalsettings','Edit survey general settings','General settings','Open general survey settings','gears','fontawesome','','','updatesurveylocalesettings','editLocalSettings_main_view','/admin/survey/subview/accordion/_generaloptions_panel','','surveysettings','read',NULL,'_generalTabEditSurvey','en-GB',date('Y-m-d H:i:s'),0,date('Y-m-d H:i:s'),0),
+                array(3,1,3,'surveytexts','Edit survey text elements','Survey texts','Edit survey text elements','file-text-o','fontawesome','','','updatesurveylocalesettings','editLocalSettings_main_view','/admin/survey/subview/tab_edit_view','','surveylocale','read',NULL,'_getTextEditData','en-GB',date('Y-m-d H:i:s'),0,date('Y-m-d H:i:s'),0),
+                array(4,1,4,'participants','Survey participants','Survey participants','Go to survey participant and token settings','user','fontawesome','','admin/tokens/sa/index/','','','','','surveysettings','update',NULL,'','en-GB',date('Y-m-d H:i:s'),0,date('Y-m-d H:i:s'),0),
+                array(5,1,4,'presentation','Presentation &amp; navigation settings','Presentation','Edit presentation and navigation settings','eye-slash','fontawesome','','','updatesurveylocalesettings','editLocalSettings_main_view','/admin/survey/subview/accordion/_presentation_panel','','surveylocale','read',NULL,'_tabPresentationNavigation','en-GB',date('Y-m-d H:i:s'),0,date('Y-m-d H:i:s'),0),
+                array(6,1,5,'publication','Publication and access control settings','Publication &amp; access','Edit settings for publicationa and access control','key','fontawesome','','','updatesurveylocalesettings','editLocalSettings_main_view','/admin/survey/subview/accordion/_publication_panel','','surveylocale','read',NULL,'_tabPublicationAccess','en-GB',date('Y-m-d H:i:s'),0,date('Y-m-d H:i:s'),0),
+                array(7,1,6,'surveypermissions','Edit surveypermissions','Survey permissions','Edit permissions for this survey','lock','fontawesome','','admin/surveypermission/sa/view/','','','','','surveysecurity','read',NULL,'','en-GB',date('Y-m-d H:i:s'),0,date('Y-m-d H:i:s'),0),
+                array(8,1,7,'tokens','Token handling','Participant tokens','Define how tokens should be treated or generated','users','fontawesome','','','updatesurveylocalesettings','editLocalSettings_main_view','/admin/survey/subview/accordion/_tokens_panel','','surveylocale','read',NULL,'_tabTokens','en-GB',date('Y-m-d H:i:s'),0,date('Y-m-d H:i:s'),0),
+                array(9,1,8,'quotas','Edit quotas','Survey quotas','Edit quotas for this survey.','tasks','fontawesome','','admin/quotas/sa/index/','','','','','quotas','read',NULL,'','en-GB',date('Y-m-d H:i:s'),0,date('Y-m-d H:i:s'),0),
+                array(10,1,9,'assessments','Edit assessments','Assessments','Edit and look at the asessements for this survey.','comment-o','fontawesome','','admin/assessments/sa/index/','','','','','assessments','read',NULL,'','en-GB',date('Y-m-d H:i:s'),0,date('Y-m-d H:i:s'),0),
+                array(11,1,10,'notification','Notification and data management settings','Data management','Edit settings for notification and data management','feed','fontawesome','','','updatesurveylocalesettings','editLocalSettings_main_view','/admin/survey/subview/accordion/_notification_panel','','surveylocale','read',NULL,'_tabNotificationDataManagement','en-GB',date('Y-m-d H:i:s'),0,date('Y-m-d H:i:s'),0),
+                array(12,1,11,'emailtemplates','Email templates','Email templates','Edit the templates for invitation, reminder and registration emails','envelope-square','fontawesome','','admin/emailtemplates/sa/index/','','','','','assessments','read',NULL,'','en-GB',date('Y-m-d H:i:s'),0,date('Y-m-d H:i:s'),0),
+                array(13,1,12,'panelintegration','Edit survey panel integration','Panel integration','Define panel integrations for your survey','link','fontawesome','','','updatesurveylocalesettings','editLocalSettings_main_view','/admin/survey/subview/accordion/_integration_panel','','surveylocale','read',NULL,'_tabPanelIntegration','en-GB',date('Y-m-d H:i:s'),0,date('Y-m-d H:i:s'),0),
+                array(14,1,13,'ressources','Add/Edit ressources to the survey','Ressources','Add/Edit ressources to the survey','file','fontawesome','','','updatesurveylocalesettings','editLocalSettings_main_view','/admin/survey/subview/accordion/_resources_panel','','surveylocale','read',NULL,'_tabResourceManagement','en-GB',date('Y-m-d H:i:s'),0,date('Y-m-d H:i:s'),0)
+            );
+            foreach($rowsToAdd as $row){
+                $oDB->createCommand()->insert('{{surveymenu_entries}}', array_combine($colsToAdd,$row));
+            }
+
+            $oDB->createCommand()->update('{{settings_global}}',array('stg_value'=>294),"stg_name='DBVersion'");
+            $oTransaction->commit();
+        }
     }
     catch(Exception $e)
     {
@@ -1725,21 +1760,18 @@ function db_upgrade_all($iOldDBVersion, $bSilent=false) {
 
 function createSurveyMenuTable293($oDB) {
     $oDB->createCommand()->createTable('{{surveymenu}}', array(
-        "id" => "int(11) NOT NULL ",
-        "parent_id" => "int(11) DEFAULT NULL",
-        "survey_id" => "int(11) DEFAULT NULL",
-        "order" => "int(11) DEFAULT '0'",
-        "level" => "int(11) DEFAULT '0'",
+        "id" => "int NOT NULL ",
+        "parent_id" => "int DEFAULT NULL",
+        "survey_id" => "int DEFAULT NULL",
+        "order" => "int DEFAULT '0'",
+        "level" => "int DEFAULT '0'",
         "title" => "character varying(255)  NOT NULL DEFAULT ''",
         "description" => "text ",
-        "changed_at" => "timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP",
-        "changed_by" => "int(11) NOT NULL DEFAULT '0'",
+        "changed_at" => "datetime NOT NULL DEFAULT CURRENT_TIMESTAMP",
+        "changed_by" => "int NOT NULL DEFAULT '0'",
         "created_at" => "datetime DEFAULT NULL",
-        "created_by" => "int(11) NOT NULL DEFAULT '0'",
-        'PRIMARY KEY (`id`)',
-        'KEY `parent_id` (`parent_id`)',
-        'KEY `order` (`order`)',
-        'KEY `title` (`title`(250))'
+        "created_by" => "int NOT NULL DEFAULT '0'",
+        'PRIMARY KEY (id)'
     ));
 
     $oDB->createCommand()->insert(
@@ -1760,9 +1792,9 @@ function createSurveyMenuTable293($oDB) {
     );
 
     $oDB->createCommand()->createTable('{{surveymenu_entries}}', array(
-        "id" => "int(11) NOT NULL ",
-        "menu_id" => "int(11) DEFAULT NULL",
-        "order" => "int(11) DEFAULT '0'",
+        "id" => "int NOT NULL ",
+        "menu_id" => "int DEFAULT NULL",
+        "order" => "int DEFAULT '0'",
         "name" => "character varying(255)  NOT NULL DEFAULT ''",
         "title" => "character varying(255)  NOT NULL DEFAULT ''",
         "menu_title" => "character varying(255)  NOT NULL DEFAULT ''",
@@ -1780,16 +1812,12 @@ function createSurveyMenuTable293($oDB) {
         "data" => "text ",
         "getdatamethod" => "character varying(255)  NOT NULL DEFAULT ''",
         "language" => "character varying(255)  NOT NULL DEFAULT 'en-GB'",
-        "changed_at" => "timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP",
-        "changed_by" => "int(11) NOT NULL DEFAULT '0'",
+        "changed_at" => "datetime NOT NULL DEFAULT CURRENT_TIMESTAMP",
+        "changed_by" => "int NOT NULL DEFAULT '0'",
         "created_at" => "datetime DEFAULT NULL",
-        "created_by" => "int(11) NOT NULL DEFAULT '0'",
+        "created_by" => "int NOT NULL DEFAULT '0'",
         "PRIMARY KEY (id)",
-        "FOREIGN KEY (menu_id) REFERENCES  prefix_surveymenu (menu_id) ON DELETE CASCADE",
-        "KEY `menu_id` (`menu_id`)",
-        "KEY `order` (`order`)",
-        "KEY `title` (`title`(191))",
-        "KEY `menu_title` (`menu_title`(191))"
+        "FOREIGN KEY (menu_id) REFERENCES  {{surveymenu}} (id) ON DELETE CASCADE"
     ));
 
     $colsToAdd = array("id","menu_id","order","name","title","menu_title","menu_description","menu_icon","menu_icon_type","menu_class","menu_link","action","template","partial","classes","permission","permission_grade","data","getdatamethod","language","changed_at","changed_by","created_at","created_by");

application/views/admin/conditions/conditionshead_view.php

@@ -1,5 +1,5 @@
 <div class='side-body <?php echo getSideBodyClass(false); ?>'>
-    <?php $this->renderPartial('/admin/survey/breadcrumb', array('oQuestion'=>$oQuestion, 'active'=>gT("Conditions designer") )); ?>
+    <?php// $this->renderPartial('/admin/survey/breadcrumb', array('oQuestion'=>$oQuestion, 'active'=>gT("Conditions designer") )); ?>
     <h3>
         <?php eT("Conditions designer"); ?>
 

application/views/admin/emailtemplates/emailtemplates_view.php

@@ -27,7 +27,7 @@
 </script>
 
 <div class="side-body <?php echo getSideBodyClass(false); ?>">
-    <?php $this->renderPartial('/admin/survey/breadcrumb', array('oSurvey'=>$oSurvey, 'active'=> gT("Edit email templates"))); ?>
+    <?php //$this->renderPartial('/admin/survey/breadcrumb', array('oSurvey'=>$oSurvey, 'active'=> gT("Edit email templates"))); ?>
     <h3><?php eT("Edit email templates"); ?></h3>
 
     <div class="row">

application/views/admin/labels/_labelviewtabcontent_view.php

@@ -39,7 +39,7 @@
                                 <td><?php echo $row['code'] ?></td><td><?php echo $row['assessment_value'] ?></td>
                                 <?php else:?>
                                 <td>
-                                    <span class="fa fa-move text-success"></span>
+                                    <span class="fa fa-bars bigIcons text-success"></span>
                                 </td>
 
                                 <td>

application/views/admin/labels/labelsetsbar_view.php

@@ -98,7 +98,7 @@
             <!-- edition action buttons -->
             <?php if (isset($labelbar['buttons']['edition'])):?>
                 <a class="btn btn-success" href="#" role="button" id="save-form-button" data-form-id="<?php echo $labelbar['savebutton']['form']; ?>">
-                    <span class="fa fa-ok"></span>
+                    <span class="fa fa-floppy-o"></span>
 
                     <?php echo $labelbar['savebutton']['text'];?>
                 </a>

application/views/admin/pluginmanager/configure.php

@@ -17,7 +17,7 @@
             <div class='form-group'>
             <div class='col-sm-6 col-md-offset-4'>
                  ". (Permission::model()->hasGlobalPermission('settings','update')?"
-                <button name='save' class='btn btn-success' type='submit'><span class='fa fa-ok'></span>&nbsp;".gT('Save')."</button>
+                <button name='save' class='btn btn-success' type='submit'><span class='fa fa-floppy-o'></span>&nbsp;".gT('Save')."</button>
                 <button name='redirect' value='" . App()->createUrl("admin/pluginmanager/sa/index") . "' class='btn btn-default' type='submit'><span class='fa fa-saved'></span>&nbsp;".gT('Save and close')."</button>
                 ":'')."
                 <a class='btn btn-danger' href='" . App()->createurl('admin/pluginmanager/sa/index') . "'>".gT('Close')."</a>