Skip to content

Commit

Permalink
Dev: filter question group
Browse files Browse the repository at this point in the history
  • Loading branch information
louis committed Sep 17, 2015
1 parent 73c8dd2 commit add6afc
Show file tree
Hide file tree
Showing 7 changed files with 98 additions and 67 deletions.
53 changes: 14 additions & 39 deletions application/controllers/admin/surveyadmin.php
View file
Expand Up @@ -64,7 +64,9 @@ public function listsurveys()
if (count(getSurveyList(true)) == 0)
{
$this->_renderWrappedTemplate('super', 'firststeps');
} else {
}
else
{
Yii::app()->loadHelper('surveytranslator');

$aData['issuperadmin'] = false;
Expand All @@ -73,7 +75,6 @@ public function listsurveys()
$aData['issuperadmin'] = true;
}


$sort = new CSort();
$sort->attributes = array(
'Survey id'=>array(
Expand Down Expand Up @@ -441,46 +442,20 @@ public function listquestiongroups($surveyid)
$aData['sidebar']['questiongroups'] = true;
$aData['sidebar']['listquestiongroups'] = true;
$aData['surveybar']['buttons']['newgroup']=true;
// $aData['surveybar']['returnbutton']['url'] = $this->getController()->createUrl("admin/survey/sa/listsurveys");
// $aData['surveybar']['returnbutton']['text'] = gT('return to survey list');

$baselang = Survey::model()->findByPk($iSurveyID)->language;

$sort = new CSort();
$sort->attributes = array(
'Group id'=>array(
'asc'=>'gid',
'desc'=>'gid desc',
),
'Group Order'=>array(
'asc'=>'group_order',
'desc'=>'group_order desc',
),
'Group Name'=>array(
'asc'=>'group_name',
'desc'=>'group_name desc',
),
);

$dataProvider=new CActiveDataProvider('QuestionGroup', array(
'criteria'=>array(
'condition'=>'sid=:surveyid AND language=:language',
'params'=>array(':surveyid'=>$iSurveyID,':language'=>$baselang)
),

'sort'=>$sort,

'pagination'=>array(
'pageSize'=>10,
),
));


$aData['groupsDatas'] = $dataProvider;

$surveyinfo = Survey::model()->findByPk($iSurveyID)->surveyinfo;
$aData["surveyinfo"] = $surveyinfo;
$aData['title_bar']['title'] = $surveyinfo['surveyls_title']."(".gT("ID").":".$iSurveyID.")";
$baselang = Survey::model()->findByPk($iSurveyID)->language;
$model = new QuestionGroup('search');

if (isset($_GET['QuestionGroup']))
{
$model->attributes = $_GET['QuestionGroup'];
}

$model['sid'] = $iSurveyID;
$model['language'] = $baselang;
$aData['model']=$model;

$this->_renderWrappedTemplate('survey', array(), $aData);
}
Expand Down
38 changes: 38 additions & 0 deletions application/models/QuestionGroup.php
View file
Expand Up @@ -198,5 +198,43 @@ public function getbuttons()
$button = '<a class="btn btn-default" href="'.$url.'" role="button"><span class="glyphicon glyphicon-pencil" aria-hidden="true"></span></a>';
return $button;
}



public function search()
{
$sort = new CSort();
$sort->attributes = array(
'Group id'=>array(
'asc'=>'gid',
'desc'=>'gid desc',
),
'Group Order'=>array(
'asc'=>'group_order',
'desc'=>'group_order desc',
),
'Group Name'=>array(
'asc'=>'group_name',
'desc'=>'group_name desc',
),
);

$criteria = new CDbCriteria;
$criteria->condition='sid=:surveyid AND language=:language';
$criteria->params=(array(':surveyid'=>$this->sid,':language'=>$this->language));
$criteria->compare('group_name', $this->group_name, true);

$dataProvider=new CActiveDataProvider(get_class($this), array(
'criteria'=>$criteria,

'sort'=>$sort,

'pagination'=>array(
'pageSize'=>10,
),
));
return $dataProvider;
}

}
?>
2 changes: 1 addition & 1 deletion application/views/admin/notifications/notifications.php
View file
@@ -1,4 +1,4 @@
<div id="notif-container" class="col-lg-12 content-right" style="padding-top: 1em; z-index: 10100">
<div id="notif-container" class="col-lg-12 content-right" style="z-index: 10100">
<?php foreach($aMessage as $message):?>
<?php if(!isset($message['type'])): ?>
<div class="alert alert-success alert-dismissible" role="alert">
Expand Down
22 changes: 21 additions & 1 deletion application/views/admin/super/listquestiongroups.php
View file
Expand Up @@ -4,13 +4,33 @@
*/

?>

<div class="side-body">
<h3><?php eT('Question Groups in this survey'); ?></h3>
<div class="row">
<div class="col-lg-12 content-right">


<div class="form">
<?php $form=$this->beginWidget('CActiveForm', array(
'action' => Yii::app()->createUrl('admin/survey/sa/listquestiongroups/surveyid/'.$surveyid),
'method' => 'get',
)); ?>
<div class="row">
<?php echo $form->label($model, 'name'); ?>
<?php echo $form->textField($model, 'group_name'); ?>
</div>
<div class="row buttons">
<?php echo CHtml::submitButton('Search'); ?>
</div>
<?php $this->endWidget(); ?>
</div><!-- form -->



<?php
$this->widget('bootstrap.widgets.TbGridView', array(
'dataProvider' => $groupsDatas,
'dataProvider' => $model->search(),
'columns' => array(

array(
Expand Down
3 changes: 2 additions & 1 deletion application/views/admin/survey/listSurveys_view.php
View file
Expand Up @@ -81,4 +81,5 @@
));
?>
</div>
</div>
</div>
</div>
45 changes: 21 additions & 24 deletions application/views/admin/update/_updateContainer.php
View file
Expand Up @@ -27,30 +27,27 @@

<div class="row">
<div class="col-lg-12 content-right">


<div id="updaterWrap">
<div id="preUpdaterContainer">
<!-- The check buttons : render by ajax only if no step is required by url or post -->
<?php // $this->renderPartial("./update/check_updates/_checkButtons", array( "thisupdatecheckperiod"=>$thisupdatecheckperiod, "updatelastcheck"=>$updatelastcheck,"UpdateNotificationForBranch"=>$UpdateNotificationForBranch )); ?>
<?php
if( $serverAnswer->result )
{
unset($serverAnswer->result);
$this->renderPartial('./update/check_updates/update_buttons/_updatesavailable', array('updateInfos' => $serverAnswer));
}
else
{
// Error : we build the error title and messages
$this->renderPartial('./update/check_updates/update_buttons/_updatesavailable_error', array('serverAnswer' => $serverAnswer));
}
?>
</div>

<!-- The updater -->
<?php $this->renderPartial("./update/updater/_updater"); ?>
</div>

<div id="updaterWrap">
<div id="preUpdaterContainer">
<!-- The check buttons : render by ajax only if no step is required by url or post -->
<?php // $this->renderPartial("./update/check_updates/_checkButtons", array( "thisupdatecheckperiod"=>$thisupdatecheckperiod, "updatelastcheck"=>$updatelastcheck,"UpdateNotificationForBranch"=>$UpdateNotificationForBranch )); ?>
<?php
if( $serverAnswer->result )
{
unset($serverAnswer->result);
$this->renderPartial('./update/check_updates/update_buttons/_updatesavailable', array('updateInfos' => $serverAnswer));
}
else
{
// Error : we build the error title and messages
$this->renderPartial('./update/check_updates/update_buttons/_updatesavailable_error', array('serverAnswer' => $serverAnswer));
}
?>
</div>

<!-- The updater -->
<?php $this->renderPartial("./update/updater/_updater"); ?>
</div>
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion application/views/admin/update/_update_notification.php
View file
Expand Up @@ -9,7 +9,7 @@
?>
<?php $urlUpdate = Yii::app()->createUrl("admin/update"); ?>

<div class="col-lg-12 content-right" id="update-container">
<div class="col-lg-12" id="update-container">

<?php if($security_update_available):?>
<div class="alert alert-warning alert-dismissible" role="alert" id="alert-security-update">
Expand Down

0 comments on commit add6afc

Please sign in to comment.