Skip to content

Commit

Permalink
Remove type from fieldmap.
Browse files Browse the repository at this point in the history
  • Loading branch information
@aaronschmitz
aaronschmitz committed Aug 15, 2012
1 parent 9f227bd commit 18160a0
Show file tree
Hide file tree
Showing 15 changed files with 19 additions and 29 deletions.
2 changes: 1 addition & 1 deletion application/helpers/common_helper.php
View file
Expand Up @@ -1492,7 +1492,7 @@ function getExtendedAnswer($iSurveyID, $sFieldCode, $sValue, $oLanguage)
}
return $sValue;
}
$fieldmap = createFieldMap($iSurveyID,'short',false,false,$sLanguage); //AJS
$fieldmap = createFieldMap($iSurveyID,'short',false,false,$sLanguage); //AJS#
if (isset($fieldmap[$sFieldCode]))
$fields = $fieldmap[$sFieldCode];
else
Expand Down
2 changes: 1 addition & 1 deletion application/helpers/expressions/em_manager_helper.php
View file
Expand Up @@ -2372,7 +2372,7 @@ private function setVariableAndTokenMappingsForExpressionManager($surveyid,$forc
$this->em->SetSurveyMode($this->surveyMode);

// TODO - do I need to force refresh, or trust that createFieldMap will cache langauges properly?
$fieldmap=createFieldMap($surveyid,$style='full',$forceRefresh,false,$_SESSION['LEMlang']);
$fieldmap=createFieldMap($surveyid,$style='full',$forceRefresh,false,$_SESSION['LEMlang']); //AJS#
$this->sid= $surveyid;

$this->runtimeTimings[] = array(__METHOD__ . '.createFieldMap',(microtime(true) - $now));
Expand Down
3 changes: 1 addition & 2 deletions application/modules/ArrayQuestion.php
View file
Expand Up @@ -17,15 +17,14 @@ protected function getChildren()
return $this->children = dbExecuteAssoc($ansquery)->readAll(); //Checked
}

public function createFieldmap($type=null)
public function createFieldmap()
{
$map = array();
$abrows = getSubQuestions($this);
foreach ($abrows as $abrow)
{
$fieldname="{$this->surveyid}X{$this->gid}X{$this->id}{$abrow['title']}";
$field['fieldname']=$fieldname;
$field['type']=$type;
$field['sid']=$this->surveyid;
$field['gid']=$this->gid;
$field['qid']=$this->id;
Expand Down
5 changes: 2 additions & 3 deletions application/modules/CheckQuestion.php
View file
Expand Up @@ -336,7 +336,7 @@ public function getHelp()
return '';
}

public function createFieldmap($type=null)
public function createFieldmap()
{
$clang = Yii::app()->lang;
$map = array();
Expand All @@ -345,7 +345,6 @@ public function createFieldmap($type=null)
{
$fieldname="{$this->surveyid}X{$this->gid}X{$this->id}{$abrow['title']}";
$field['fieldname']=$fieldname;
$field['type']=$type;
$field['sid']=$this->surveyid;
$field['gid']=$this->gid;
$field['qid']=$this->id;
Expand Down Expand Up @@ -378,7 +377,7 @@ public function createFieldmap($type=null)
}
if ($this->isother=='Y')
{
$other = parent::createFieldmap($type);
$other = parent::createFieldmap();
$other = $other[$this->fieldname];
$other['fieldname'].='other';
$other['aid']='other';
Expand Down
4 changes: 2 additions & 2 deletions application/modules/CommentCheckQuestion.php
View file
Expand Up @@ -206,11 +206,11 @@ public function getDataEntry($idrow, &$fnames, $language)
return $output;
}

public function createFieldmap($type=null)
public function createFieldmap()
{
$clang = Yii::app()->lang;
$map = array();
$tmp = parent::createFieldmap($type);
$tmp = parent::createFieldmap();
foreach($tmp as $field)
{
$comment = $field;
Expand Down
4 changes: 2 additions & 2 deletions application/modules/CommentListQuestion.php
View file
Expand Up @@ -185,10 +185,10 @@ public function getDataEntry($idrow, &$fnames, $language)
return $output;
}

public function createFieldmap($type=null)
public function createFieldmap()
{
$clang = Yii::app()->lang;
$map = QuestionModule::createFieldmap($type);
$map = QuestionModule::createFieldmap();
$comment = $map[$this->fieldname];
$comment['fieldname'].='comment';
$comment['aid']='comment';
Expand Down
3 changes: 1 addition & 2 deletions application/modules/DualRadioArrayQuestion.php
View file
Expand Up @@ -597,7 +597,7 @@ public function getAnswerHTML()
return $answer;
}

public function createFieldmap($type=null)
public function createFieldmap()
{
$clang = Yii::app()->lang;
$abrows = getSubQuestions($this);
Expand All @@ -606,7 +606,6 @@ public function createFieldmap($type=null)
{
$fieldname="{$this->surveyid}X{$this->gid}X{$this->id}{$abrow['title']}#0";
$field['fieldname']=$fieldname;
$field['type']=$type;
$field['sid']=$this->surveyid;
$field['gid']=$this->gid;
$field['qid']=$this->id;
Expand Down
3 changes: 1 addition & 2 deletions application/modules/FileQuestion.php
View file
Expand Up @@ -208,13 +208,12 @@ public function getFileValidationMessage()
return $qtitle;
}

public function createFieldmap($type=null)
public function createFieldmap()
{
$clang = Yii::app()->lang;
$qidattributes= getQuestionAttributeValues($this->id);
$fieldname="{$this->surveyid}X{$this->gid}X{$this->id}";
$field['fieldname']=$fieldname;
$field['type']=$type;
$field['sid']=$this->surveyid;
$field['gid']=$this->gid;
$field['qid']=$this->id;
Expand Down
4 changes: 2 additions & 2 deletions application/modules/ListQuestion.php
View file
Expand Up @@ -340,10 +340,10 @@ public function getHelp()
return '';
}

public function createFieldmap($type=null)
public function createFieldmap()
{
$clang = Yii::app()->lang;
$map = parent::createFieldmap($type);
$map = parent::createFieldmap();
if($this->isother=='Y')
{
$other = $map[$this->fieldname];
Expand Down
3 changes: 1 addition & 2 deletions application/modules/MultinumericalQuestion.php
View file
Expand Up @@ -366,15 +366,14 @@ public function getHeaderIncludes()
}
}

public function createFieldmap($type=null)
public function createFieldmap()
{
$map = array();
$abrows = getSubQuestions($this);
foreach ($abrows as $abrow)
{
$fieldname="{$this->surveyid}X{$this->gid}X{$this->id}{$abrow['title']}";
$field['fieldname']=$fieldname;
$field['type']=$type;
$field['sid']=$this->surveyid;
$field['gid']=$this->gid;
$field['qid']=$this->id;
Expand Down
3 changes: 1 addition & 2 deletions application/modules/MultitextQuestion.php
View file
Expand Up @@ -202,15 +202,14 @@ protected function getChildren()
return $this->children = dbExecuteAssoc($ansquery)->readAll(); //Checked
}

public function createFieldmap($type=null)
public function createFieldmap()
{
$map = array();
$abrows = getSubQuestions($this);
foreach ($abrows as $abrow)
{
$fieldname="{$this->surveyid}X{$this->gid}X{$this->id}{$abrow['title']}";
$field['fieldname']=$fieldname;
$field['type']=$type;
$field['sid']=$this->surveyid;
$field['gid']=$this->gid;
$field['qid']=$this->id;
Expand Down
3 changes: 1 addition & 2 deletions application/modules/NumberArrayQuestion.php
View file
Expand Up @@ -410,7 +410,7 @@ public function getDataEntry($idrow, &$fnames, $language)
return $output;
}

public function createFieldmap($type=null)
public function createFieldmap()
{
$map = array();
$abrows = getSubQuestions($this);
Expand All @@ -427,7 +427,6 @@ public function createFieldmap($type=null)
{
$fieldname="{$this->surveyid}X{$this->gid}X{$this->id}{$abrow['title']}_{$answer['title']}";
$field['fieldname']= $fieldname;
$field['type']=$type;
$field['sid']=$this->surveyid;
$field['gid']=$this->gid;
$field['qid']=$this->id;
Expand Down
3 changes: 1 addition & 2 deletions application/modules/QuestionModule.php
View file
Expand Up @@ -150,10 +150,9 @@ public function getPopup($notanswered=null)
return false;
}

public function createFieldmap($type=null)
public function createFieldmap()
{
$map['fieldname']=$this->fieldname;
$map['type']=$type;
$map['sid']=$this->surveyid;
$map['gid']=$this->gid;
$map['qid']=$this->id;
Expand Down
3 changes: 1 addition & 2 deletions application/modules/RankingQuestion.php
View file
Expand Up @@ -291,15 +291,14 @@ public function getHeaderIncludes()
return array('ranking.js' => 'js', 'ranking.css' => 'css');
}

public function createFieldmap($type=null)
public function createFieldmap()
{
$clang = Yii::app()->lang;
$data = Answers::model()->findAllByAttributes(array('qid' => $this->id, 'language' => $this->language));
for ($i=1; $i<=count($data); $i++)
{
$fieldname="{$this->surveyid}X{$this->gid}X{$this->id}$i";
$field['fieldname']=$fieldname;
$field['type']=$type;
$field['sid']=$this->surveyid;
$field['gid']=$this->gid;
$field['qid']=$this->id;
Expand Down
3 changes: 1 addition & 2 deletions application/modules/TextArrayQuestion.php
View file
Expand Up @@ -387,7 +387,7 @@ public function getDataEntry($idrow, &$fnames, $language)
return $output;
}

public function createFieldmap($type=null)
public function createFieldmap()
{
$map = array();
$abrows = getSubQuestions($this);
Expand All @@ -404,7 +404,6 @@ public function createFieldmap($type=null)
{
$fieldname="{$this->surveyid}X{$this->gid}X{$this->id}{$abrow['title']}_{$answer['title']}";
$field['fieldname']= $fieldname;
$field['type']=$type;
$field['sid']=$this->surveyid;
$field['gid']=$this->gid;
$field['qid']=$this->id;
Expand Down

0 comments on commit 18160a0

Please sign in to comment.