Dev Extended question type field

Dev Removed autoincrement from timing tables Dev Fixed question/group import
LimeSurvey · Jan 10, 2018 · a5c414f · a5c414f
1 parent 35c62a4
commit a5c414f
Show file tree

Hide file tree

Showing 7 changed files with 520 additions and 228 deletions.
diff --git a/application/controllers/admin/surveyadmin.php b/application/controllers/admin/surveyadmin.php
@@ -1818,15 +1818,17 @@ private function _createSampleGroup($iSurveyID)
     {
         // Now create a new dummy group
         $sLanguage = Survey::model()->findByPk($iSurveyID)->language;
-        $aInsertData = array(
-            'sid' => $iSurveyID,
-            'group_order' => 1,
-            'grelevance' => '1');
-        $aInsertData[$sLanguage] = array(
-            'group_name' => gt('My first question group', 'html', $sLanguage),
-            'description' => '',
-            'language' => $sLanguage);
-        return QuestionGroup::model()->insertNewGroup($aInsertData);
+        $oGroup=new QuestionGroup();
+        $oGroup->sid=$iSurveyID;
+        $oGroup->group_order=1;
+        $oGroup->grelevance='1';
+        $oGroup->save();
+        $oGroupL10ns=new QuestionGroupL10ns();
+        $oGroupL10ns->gid=$oGroup->gid;
+        $oGroupL10ns->group_name=gt('My first question group', 'html', $sLanguage);
+        $oGroupL10ns->language=$sLanguage;
+        $oGroupL10ns->save();
+        return $oGroup->gid;
     }
 
     /**

diff --git a/application/helpers/admin/activate_helper.php b/application/helpers/admin/activate_helper.php
@@ -461,14 +461,15 @@ function activateSurvey($iSurveyID, $simulate = false)
         $timingsfieldmap = createTimingsFieldMap($iSurveyID, "full", false, false, $oSurvey->language);
 
         $aTimingTableDefinition = array();
-        $aTimingTableDefinition['id'] = $aTableDefinition['id'];
+        $aTimingTableDefinition['id'] = 'integer';
         foreach ($timingsfieldmap as $field=>$fielddata) {
             $aTimingTableDefinition[$field] = 'FLOAT';
         }
 
         $sTableName = "{{survey_{$iSurveyID}_timings}}";
         try {
             Yii::app()->db->createCommand()->createTable($sTableName, $aTimingTableDefinition);
+            Yii::app()->db->createCommand()->addPrimaryKey('PK_Timing_'.rand(1, 50000), $sTableName, 'id');
             Yii::app()->db->schema->getTable($sTableName, true); // Refresh schema cache just in case the table existed in the past
         } catch (CDbException $e) {
             return array('error'=>'timingstablecreation');