diff --git a/application/controllers/admin/questions.php b/application/controllers/admin/questions.php index 0dcc3d2b3b1..49dc0abeb0d 100644 --- a/application/controllers/admin/questions.php +++ b/application/controllers/admin/questions.php @@ -1040,6 +1040,10 @@ public function index($sa, $surveyid, $gid, $qid=null) } App()->getClientScript()->registerScriptFile(Yii::app()->getConfig('adminscripts') . 'questions.js'); + $aData['sValidateUrl'] = ($adding || $copying)?$this->getController()->createUrl('admin/questions', array('sa' => 'ajaxValidate','surveyid'=>$surveyid)):$this->getController()->createUrl('admin/questions', array('sa' => 'ajaxValidate','surveyid'=>$surveyid,'qid'=>$qid)); + + $aData['addlanguages'] = Survey::model()->findByPk($surveyid)->additionalLanguages; + $aViewUrls['editQuestion_view'][] = $aData; $aViewUrls['questionJavascript_view'][] = array('type' => $eqrow['type']); } diff --git a/application/controllers/admin/surveyadmin.php b/application/controllers/admin/surveyadmin.php index d228b343c20..6494cbbd1a2 100644 --- a/application/controllers/admin/surveyadmin.php +++ b/application/controllers/admin/surveyadmin.php @@ -395,19 +395,21 @@ public function view($iSurveyID, $gid = null, $qid = null) $survey = Survey::model()->findByPk($iSurveyID); $surveyinfo = $survey->surveyinfo; - $aData['title_bar']['title'] = $surveyinfo['surveyls_title']."(".gT("ID").":".$iSurveyID.")"; $aData["surveyinfo"] = $surveyinfo; $aData['surveyid'] = $iSurveyID; $aData['gid'] = $gid; $aData['qid'] = $qid; + if($gid==null) - $aData['display']['surveysummary'] = true; - $aData['surveybar']['buttons']['view']= true; + { + $aData['display']['surveysummary'] = true; + } + + $aData['surveybar']['buttons']['view']= true; $aData['surveybar']['returnbutton']['url'] = $this->getController()->createUrl("admin/survey/sa/listsurveys"); $aData['surveybar']['returnbutton']['text'] = gT('return to survey list'); - $aData['sidebar']["survey_menu"]=TRUE; diff --git a/application/core/Survey_Common_Action.php b/application/core/Survey_Common_Action.php index ec841489575..255eb3b838a 100644 --- a/application/core/Survey_Common_Action.php +++ b/application/core/Survey_Common_Action.php @@ -733,7 +733,9 @@ function _surveybar($aData) //$sumquery3 = "SELECT * FROM ".db_table_name('questions')." WHERE sid={$iSurveyID} AND parent_qid=0 AND language='".$baselang."'"; //Getting a count of questions for this survey $sumresult3 = Question::model()->findAllByAttributes($condition); //Checked $sumcount3 = count($sumresult3); - + + + $aData['canactivate'] = $sumcount3 > 0 && Permission::model()->hasSurveyPermission($iSurveyID, 'surveyactivation', 'update'); $aData['candeactivate'] = Permission::model()->hasSurveyPermission($iSurveyID, 'surveyactivation', 'update'); $aData['expired'] = $surveyinfo['expires'] != '' && ($surveyinfo['expires'] < dateShift(date("Y-m-d H:i:s"), "Y-m-d H:i", Yii::app()->getConfig('timeadjust'))); @@ -1155,6 +1157,7 @@ function _surveysummary($iSurveyID, $action=null, $gid=null) $aData['aAdditionalLanguages'] = $aAdditionalLanguages; $aData['surveyinfo'] = $aSurveyInfo; + $aData['groups_count'] = $sumcount2; $this->getController()->renderPartial("/admin/survey/surveySummary_view", $aData); } diff --git a/application/views/admin/survey/Question/editQuestion_view.php b/application/views/admin/survey/Question/editQuestion_view.php index c9906923743..30dd7b8cdcc 100644 --- a/application/views/admin/survey/Question/editQuestion_view.php +++ b/application/views/admin/survey/Question/editQuestion_view.php @@ -1,226 +1,202 @@ renderPartial("./survey/Question/question_subviews/_ajax_variables", $ajaxDatas); ?> -createUrl('admin/questions', array('sa' => 'ajaxValidate','surveyid'=>$surveyid)); -}else{ - $sValidateUrl=$this->createUrl('admin/questions', array('sa' => 'ajaxValidate','surveyid'=>$surveyid,'qid'=>$qid)); -} -?> - - - - +renderPartial("./survey/Question/newQuestion_subviews/_ajax_variables", $ajaxDatas); ?> - - -
-

- - - - - - - - + + +

+

+
+ - 'form30','id'=>'frmeditquestion','name'=>'frmeditquestion')); ?> + +
- findByPk($surveyid)->additionalLanguages; - $this->renderPartial('./survey/Question/question_subviews/_tabs',array('eqrow'=>$eqrow,'addlanguages'=>$addlanguages, 'surveyid'=>$surveyid, 'gid'=>NULL, 'qid'=>NULL, 'adding'=>$adding, 'aqresult'=>$aqresult, 'action'=>$action )); - ?> - - -
- - - - - - - - - - - -
- renderPartial('./survey/Question/question_subviews/_tabs',array('eqrow'=>$eqrow,'addlanguages'=>$addlanguages, 'surveyid'=>$surveyid, 'gid'=>NULL, 'qid'=>NULL, 'adding'=>$adding, 'aqresult'=>$aqresult, 'action'=>$action )); ?> +
+ + +
+ renderPartial('./survey/Question/newQuestion_subviews/_accordion_container', $accordionDatas); - ?> -
-
-
- -
-
-
-
- -
- - $questionType) + ?> +
+
+
+ +
+
+
+
+ +
+ + $questionType) + { + if (!isset($groups[$questionType['group']])) { - if (!isset($groups[$questionType['group']])) - { - $groups[$questionType['group']] = array(); - } - $groups[$questionType['group']][$key] = $questionType['description']; + $groups[$questionType['group']] = array(); } - ?> + $groups[$questionType['group']][$key] = $questionType['description']; + } + ?> + + + +
+ - - -
- +
    -
      - - $group):?> - - - $option):?> -
    • - > -
      • - - - - + $group):?> + + + $option):?> +
    • + > +
      • + -
    -
- - $questionType) - { - $aQtypeData[]=array('code'=>$key,'description'=>$questionType['description'],'group'=>$questionType['group']); - } - echo CHtml::dropDownList( - 'type', - 'category', - CHtml::listData($aQtypeData,'code','description','group'), - array( - 'class' => 'none', - 'id'=>'question_type', - 'options' => array($eqrow['type']=>array('selected'=>true)) - ) - ); - ?> - -
- -
- - -
- -
- - - - checked - - />   - - checked='checked' - - /> - - - - -
- - - -
- - - widget('yiiwheels.widgets.switch.WhSwitch', array('name' => 'mandatory', 'value'=> '0' ));?> -
- -
- - -
- -
- - -
-
-
-
-
- - -
- -
-
- + + + + +
+ + $questionType) + { + $aQtypeData[]=array('code'=>$key,'description'=>$questionType['description'],'group'=>$questionType['group']); + } + echo CHtml::dropDownList( + 'type', + 'category', + CHtml::listData($aQtypeData,'code','description','group'), + array( + 'class' => 'none', + 'id'=>'question_type', + 'options' => array($eqrow['type']=>array('selected'=>true)) + ) + ); + ?> + +
+ +
+ + +
+ +
+ + + + checked + + />   + + checked='checked' + + /> + + + + +
+ -
-
- -
+ +
+ + + widget('yiiwheels.widgets.switch.WhSwitch', array('name' => 'mandatory', 'value'=> '0' ));?> +
-
- -
+
+ +
-
-
+
+ + +
+
+
+
+
+ + +
+ +
+
+ + +
+
+ +
+ +
+ +
+ +
+
+
diff --git a/application/views/admin/survey/Question/newQuestion_subviews/_tabs.php b/application/views/admin/survey/Question/newQuestion_subviews/_tabs.php index dee7173ca59..b963762bedd 100644 --- a/application/views/admin/survey/Question/newQuestion_subviews/_tabs.php +++ b/application/views/admin/survey/Question/newQuestion_subviews/_tabs.php @@ -7,14 +7,14 @@ -
    + + +
    + +
    -
    -