diff --git a/lib/WebGUI/Asset/Wobject/Survey.pm b/lib/WebGUI/Asset/Wobject/Survey.pm index fa7dae96e..8aa5b01bc 100644 --- a/lib/WebGUI/Asset/Wobject/Survey.pm +++ b/lib/WebGUI/Asset/Wobject/Survey.pm @@ -107,6 +107,13 @@ sub definition { defaultValue => '1oBRscNIcFOI-pETrCOspA', namespace => 'Survey/Edit', }, + questionEditTemplateId => { + tab => 'display', + fieldType => 'template', + label => "Section Edit Tempalte", + defaultValue => 'wAc4azJViVTpo-2NYOXWvg', + namespace => 'Survey/Edit', + }, ); push(@{$definition}, { @@ -145,19 +152,20 @@ This overloads the normal call to the super, to call the super call like normal #------------------------------------------------------------------- -sub processPropertiesFromFormPost { - my $self = shift; - $self->SUPER::processPropertiesFromFormPost; +#sub processPropertiesFromFormPost { +# my $self = shift; +# $self->SUPER::processPropertiesFromFormPost; - $self->loadSurveyJSON(); - if($#{$self->{_data}->{sections}} < 0){ -$self->session->errorHandler->error("In Processing from Post\n"); - $self->{_data}->update(['NEW'],undef,$self->session->errorHandler); +# $self->loadSurveyJSON(); +# if($#{$self->{_data}->{sections}} < 0){ +#$self->session->errorHandler->error("In Processing from Post\n"); +# my $section = $self->{_data}->newSection(); +# $self->{_data}->addSection($section); -$self->session->errorHandler->error("Processing from creation\n".Dumper $self->{_data}); - } - $self->saveSurveyJSON(); -} +#$self->session->errorHandler->error("Processing from creation\n".Dumper $self->{_data}); +# } +# $self->saveSurveyJSON(); +#} #------------------------------------------------------------------- @@ -170,15 +178,15 @@ Loads the survey collateral into memory so that the survey objects can be create sub loadSurveyJSON{ my $self = shift; - if(defined $self->{_data}){return;}#already loaded + if(defined $self->helper){return;}#already loaded my $jsonHash = $self->session->db->quickScalar("select surveyJSON from Survey where assetId = ?",[$self->getId]); -#$self->session->errorHandler->error("LOADING\n".Dumper $jsonHash."\n\n"); - my $hashRef = {}; - $hashRef = decode_json($jsonHash) if defined $jsonHash; - - $self->{_data} = WebGUI::Asset::Wobject::Survey::SurveyJSON->new($hashRef,$self->session->errorHandler); + +$self->session->errorHandler->error("LOADING JSON"); + + $self->{jsonHelper} = WebGUI::Asset::Wobject::Survey::SurveyJSON->new($jsonHash,$self->session->errorHandler); +$self->session->errorHandler->error("Loaded JSON\n\n".Dumper $self->helper->freeze); } #------------------------------------------------------------------- @@ -188,14 +196,17 @@ sub loadSurveyJSON{ Saves the survey collateral to the DB =cut +sub helper{ return shift->{jsonHelper}; } +sub littleBuddy{ return shift->{jsonHelper}; } +sub allyourbases{ return shift->{jsonHelper}; } +sub helpmehelpme{ return shift->{jsonHelper}; } sub saveSurveyJSON{ my $self = shift; - $self->{_data}->{log} = $self->session->errorHandler; - my $data; - $data = $self->{_data}->freeze(); -$self->session->errorHandler->error("----------------SAving THIS DATA".Dumper $data); - $data = encode_json($data); + + my $data = $self->helper->freeze(); + +$self->session->errorHandler->error("Saving THIS DATA\n\n".$data); $self->session->db->write("update Survey set surveyJSON = ? where assetId = ?",[$data,$self->getId]); } @@ -226,22 +237,21 @@ $self->session->errorHandler->error("Submit Edit Object"); # my $ref = @{decode_json($self->session->form->process("data"))}; my $responses = $self->session->form->paramsHashRef(); + my @address = split/-/,$responses->{id}; -#$self->session->errorHandler->error("Submit Edit Object".Dumper $responses); + $self->loadSurveyJSON(); if($responses->{delete}){ $self->session->errorHandler->error("Deleting ".join(',',@address)); return $self->deleteObject(\@address); } -$self->session->errorHandler->error("Updating ".join(',',@address)."Which has $$responses{terminalUrl} as the tu"); +$self->session->errorHandler->error("Updating ".join(',',@address)); #each object checks the ref and then either updates or passes it to the correct child. New objects will have an index of -1. - my $message = $self->{_data}->update(\@address,$responses,$self->session->errorHandler); + my $message = $self->helper->update(\@address,$responses); -# $self->saveSurveyJSON(); - -# return $self->www_loadSurvey({address => $ref->{ids},message=>$message}); $self->saveSurveyJSON(); - return $self->www_loadSurvey(); + + return $self->www_loadSurvey({address => \@address}); } @@ -251,15 +261,11 @@ sub deleteObject{ $self->loadSurveyJSON(); - my $message = $self->{_data}->remove($address);#each object checks the ref and then either updates or passes it to the correct child. New objects will have an index of -1. + my $message = $self->helper->remove($address);#each object checks the ref and then either updates or passes it to the correct child. New objects will have an index of -1. $self->saveSurveyJSON(); - - #The last address in ideas is to a deleted object so that should not be returned. - pop(@{$address}); - if(@$address < 1){ - $$address[0] = 0; - } + #The parent address of the deleted object is returned. + pop(@{$address}) unless @$address == 1 and $$address[0] == 0; return $self->www_loadSurvey({address => $address, message=>$message}); } @@ -270,16 +276,23 @@ sub www_newObject{ my $self = shift; my $ref; - $ref->{ids} = @{decode_json($self->session->form->process("data"))}; +$self->session->errorHandler->error("Entering newObject"); + my $ids = $self->session->form->process("data"); + + my @inAddress = split/-/,$ids; +$self->session->errorHandler->error("Address is:".join(',', @inAddress)); $self->loadSurveyJSON(); - my $object = $self->{_data}->createTemp($ref); + #Don't save after this as the new object should not stay in the survey + my $address = $self->helper->newObject(\@inAddress); + +$self->session->errorHandler->error("New objects address is:".join(',', @$address)); #The new temp object has an address of NEW, which means it is not a real final address. - push(@{$ref->{ids}},'NEW'); - return $self->www_loadSurvey({address => $ref->{ids}, message => undef, object => $object}); + return $self->www_loadSurvey({address => $address, message => undef}); + } @@ -288,107 +301,39 @@ sub www_dragDrop{ my $self = shift; my $p = decode_json($self->session->form->process("data")); - my $target = $p->{'target'};#The item moved - my $before = $p->{'before'};#The item directly in front of it, empty for first in list +$self->session->errorHandler->error("In Drag Drop ".Dumper $p); - if($target->{'type'} eq 'section'){ - my $pid; + my @tid = split/-/,$p->{target}->{id}; + my @bid = split/-/,$p->{before}->{id}; - my $tseqNum = $self->session->db->quickScalar("select sequenceNumber from Survey_section where Survey_sectionId = ?",[$target->{'id'}]); - - if($before->{'id'} eq ''){#before doens't exist, object was moved to the front - $self->session->db->write("update Survey_section set sequenceNumber = sequenceNumber +1 where sequenceNumber < ? and assetId = ?",[$tseqNum,$self->getId]); - $self->session->db->write("update Survey_section set sequenceNumber = 1 where Survey_sectionId = ?",[$target->{'id'}]); - }else{#before exists - $pid = $before->{'id'}; - if($before->{'type'} eq 'question'){ - $pid = my $section = $self->session->db->quickScalar("select Survey_sectionId from Survey_question where Survey_questionId = ?",[$before->{'id'}]); - } - elsif($before->{'type'} eq 'answer'){ - $pid = my $section = $self->session->db->quickScalar(" - select sq.Survey_sectionId - from Survey_answer sa, Survey_question sq - where sa.Survey_answerId = ? and sa.Survey_questionId = sq.Survey_questionId", - [$before->{'id'}]); - } - my $bseqNum = $self->session->db->quickScalar("select sequenceNumber from Survey_section where Survey_sectionId = ?",[$pid]); - if($tseqNum > $bseqNum){ - $self->session->db->write(" - update Survey_section - set sequenceNumber = sequenceNumber+1 - where sequenceNumber > ? and sequenceNumber < ? and assetId = ?",[$bseqNum, $tseqNum,$self->getId]); - $self->session->db->write("update Survey_section set sequenceNumber = ? where Survey_sectionId = ?",[$bseqNum+1,$target->{'id'}]); - }elsif($bseqNum > $tseqNum){ - $self->session->db->write(" - update Survey_section - set sequenceNumber = sequenceNumber-1 - where sequenceNumber > ? and sequenceNumber <= ? and assetId = ?",[$tseqNum, $bseqNum,$self->getId]); - $self->session->db->write("update Survey_section set sequenceNumber = ? where Survey_sectionId = ?",[$bseqNum,$target->{'id'}]); - } - } - - - } - - elsif($target->{'type'} eq 'question'){ - if($before->{'id'} ne ''){ - my @tids = split(/\|\|\|\|/,$target->{'id'}); - my $tseqNum = $self->session->db->quickScalar("select sequenceNumber from Survey_question where Survey_questionId = ?",[$tids[1]]); - if($before->{'type'} eq 'section' and $before->{'id'} eq $tids[0]){#moved to front of section question belongs to - $self->session->db->write("update Survey_question set sequenceNumber = sequenceNumber +1 where sequenceNumber < ? and Survey_sectionId = ?", - [$tseqNum,$tids[0]]); - $self->session->db->write("update Survey_question set sequenceNumber = 1 where Survey_questionId = ?",[$tids[1]]); - } - elsif($before->{'type'} eq 'section' and $before->{'id'} ne $tids[0]){#question moved to new section - #move down 1 seqnumber all questions higher up in section - $self->session->db->write("update Survey_question set sequenceNumber = sequenceNumber - 1 where sequenceNumber > ? and Survey_sectionId = ?", - [$tseqNum,$tids[0]]); - #append question to last question in new section - my $lastSeq = $self->session->db->quickScalar("select max(sequenceNumber) from Survey_question where Survey_sectionId = ?",[$$before{'id'}]); - $self->session->db->write("update Survey_question set Survey_sectionId = ?, sequenceNumber = ? where Survey_questionId = ?", - [ $$before{'id'}, $lastSeq + 1, $tids[1] ]); - $target->{'id'} = $before->{'id'}."||||".$tids[1]; - } - elsif($before->{'type'} eq 'question'){#will always have the same sectionid. - my @bids = split(/\|\|\|\|/,$before->{'id'}); - my $bseqNum = $self->session->db->quickScalar("select sequenceNumber from Survey_question where Survey_questionId = ?",[$bids[1]]); - if($bseqNum > $tseqNum){#target was in front of before so before + all in between moved up - $self->session->db->write("update Survey_question set sequenceNumber = sequenceNumber - 1 where sequenceNumber > ? and - sequenceNumber <= ? and Survey_sectionId = ?",[$tseqNum,$bseqNum,$tids[0]]); - $self->session->db->write("update Survey_question set sequenceNumber = ? where Survey_questionId = ?",[$bseqNum,$tids[1]]); - }else{ - $self->session->db->write("update Survey_question set sequenceNumber = sequenceNumber + 1 where sequenceNumber > ? and - sequenceNumber < ? and Survey_sectionId = ?",[$bseqNum,$tseqNum,$tids[0]]); - $self->session->db->write("update Survey_question set sequenceNumber = ? where Survey_questionId = ?",[$bseqNum+1,$tids[1]]); - } - - } - } - } - - else{#is an answer - - my @tids = split(/\|\|\|\|/,$target->{'id'}); - my @bids = split(/\|\|\|\|/,$before->{'id'}); - my $tseqNum = $self->session->db->quickScalar("select sequenceNumber from Survey_answer where Survey_answerId = ?",[$tids[2]]); - if($before->{'type'} eq 'question' and $bids[1] eq $tids[1]){#answer has been moved to the front - $self->session->db->write("update Survey_answer set sequenceNumber = sequenceNumber + 1 where Survey_questionId = ? and sequenceNumber < ?",[$tids[1],$tseqNum]); - $self->session->db->write("update Survey_answer set sequenceNumber = 1 where Survey_answerId = ?",[$tids[2]]); - }elsif($before->{'type'} eq 'answer'){#will always be in the same quesiton - my $bseqNum = $self->session->db->quickScalar("select sequenceNumber from Survey_answer where Survey_answerId = ?",[$bids[2]]); - if($tseqNum > $bseqNum){ - $self->session->db->write("update Survey_answer set sequenceNumber = sequenceNumber + 1 where Survey_questionId = ? - and sequenceNumber > ? and sequenceNumber < ?",[$tids[1],$bseqNum,$tseqNum]); - $self->session->db->write("update Survey_answer set sequenceNumber = ? + 1 where Survey_answerId = ?",[$bseqNum,$tids[2]]); + $self->loadSurveyJSON(); + my $target = $self->helper->getObject(\@tid); + $self->helper->remove(\@tid,1); + my $address = [0]; + if(@tid == 1){ + $#bid = 0;#sections can only be inserted after another section so chop off the question and answer portion of + $bid[0] = -1 if(! defined $bid[0]); + $self->helper->insertObject($target, [$bid[0]]); + }elsif(@tid == 2){#questions can be moved to any section, but a pushed to the end of a new section. + if(@bid == 1){#moved to a new section or head of current section + if($bid[0] == $tid[0]){#moved to top of current section + $bid[1] = -1; }else{ - $self->session->db->write("update Survey_answer set sequenceNumber = sequenceNumber - 1 where Survey_questionId = ? - and sequenceNumber <= ? and sequenceNumber > ?",[$tids[1],$bseqNum,$tseqNum]); - $self->session->db->write("update Survey_answer set sequenceNumber = ? where Survey_answerId = ?",[$bseqNum,$tids[2]]); + $bid[1] = $#{$self->helper->questions([$bid[0]])}; } } + $self->helper->insertObject($target, [$bid[0],$bid[1]]); + }elsif(@tid == 3){#answers can only be rearranged in the same question + if(@$bid == 2 and $bid[1] == $tid[1]){ + $bid[2] = -1; + $self->helper->insertObject($target, [$bid[0],$bid[1],$bid[2]]); + }elsif(@$bid == 3){ + $self->helper->insertObject($target, [$bid[0],$bid[1],$bid[2]]); + }else{ + $self->helper->insertObject($target, \@tid);#else put it back where it was } - - return $self->www_loadSurvey($target->{'id'}); + + return $self->www_loadSurvey({address => $address}); } @@ -398,37 +343,43 @@ sub www_loadSurvey{ $self->session->errorHandler->error("Entering loadSurvey"); $self->loadSurveyJSON(); -$self->session->errorHandler->error("Loaded JSON"); - my $address = $options->{address} ? defined $options : [0]; - my $message = $options->{message} ? defined $options : ''; -$self->session->errorHandler->error("Getting edit vars"); - my $var = $options->{var} ? defined $options : $self->{_data}->getEditVars($address); -$self->session->errorHandler->error("Got edit vars"); -$self->session->errorHandler->error("Loaded beginning params ".@$address); - my $editHtml; - if($var->{type} eq 'section'){ - $var->{id} = join('-',@$address); - $var->{displayed_id} = $address->[$#$address]; - if($var->{displayed_id} ne 'NEW'){$var->{displayed_id}++;} - - $editHtml = $self->processTemplate($var,$self->get("sectionEditTemplateId")); + my $address = defined $options->{address} ? $options->{address} : undef; + if(! defined $address){ + if(my $inAddress = $self->session->form->process("data")){ + $address = [split/-/,$inAddress]; + }else{ + $address = [0]; + } } + my $message = defined $options->{message} ? $options->{message} : ''; +$self->session->errorHandler->error("Getting edit vars:".join(',',@$address)); + my $var = defined $options->{var} ? $options->{var} : $self->helper->getEditVars($address); -$self->session->errorHandler->error(Dumper $var); +$self->session->errorHandler->error("Got edit vars"); +$self->session->errorHandler->error("Loaded beginning params ".join(',',@$address)); + my $editHtml; +$self->session->errorHandler->error("The edit vars:".Dumper $var); + if($var->{type} eq 'section'){ + $editHtml = $self->processTemplate($var,$self->get("sectionEditTemplateId")); + }elsif($var->{type} eq 'question'){ + $editHtml = $self->processTemplate($var,$self->get("questionEditTemplateId")); + } +#$self->session->errorHandler->error("The HTML :$editHtml"); - my @data; my %buttons; - $self->{_data}->getDragDropList($address,\@data,$self->session->errorHandler); + my $data = $self->helper->getDragDropList($address); +$self->session->errorHandler->error("The DD data :".Dumper $data); my $html; - my ($scount,$qcount,$acount) = (0,0,0); + my ($scount,$qcount,$acount) = (-1,-1,-1); my $lastType; my %lastId; my @ids; my ($s,$q,$a) = (0,0,0);#bools on if a button has already been created - foreach (@data){ + foreach (@$data){ if($_->{type} eq 'section'){ + $lastId{section} = ++$scount; if($lastType eq 'answer'){ $html .= "
"; $buttons{answer} = "$lastId{section}-$lastId{question}"; @@ -441,24 +392,26 @@ $self->session->errorHandler->error(Dumper $var); } $html .= "
  • S". ($scount + 1). ": $_->{text}<\/li>
    \n"; push(@ids,$scount); - $lastId{section} = $scount++; $lastType = 'section'; + $qcount = -1; + $acount = -1; } elsif($_->{type} eq 'question'){ + $lastId{question} = ++$qcount; if($lastType eq 'answer'){ $html .= "
    "; $buttons{answer} = "$lastId{section}-$lastId{question}"; $a = 1; } $html .= "
  • Q". ($qcount + 1). ": $_->{text}<\/li>
    \n"; - push(@ids,$qcount); - $lastId{question} = $qcount++; + push(@ids,"$scount-$qcount"); $lastType = 'question'; + $acount = -1; } elsif($_->{type} eq 'answer'){ + $lastId{answer} = ++$acount; $html .= "
  • A". ($acount + 1). ": $_->{text}<\/li>
    \n"; - push(@ids,$acount); - $lastId{answer} = $acount++; + push(@ids,"$scount-$qcount-$acount"); $lastType = 'answer'; } } @@ -469,7 +422,7 @@ $self->session->errorHandler->error(Dumper $var); } if(!$b){ $html .= "
    "; - $buttons{'question'} = "$lastId{section}-$lastId{question}"; + $buttons{'question'} = "$lastId{section}"; } if(!$s){ $html .= "
    "; @@ -479,7 +432,7 @@ $self->session->errorHandler->error(Dumper $var); elsif($lastType eq 'question'){ if(!$b){ $html .= "
    "; - $buttons{'question'} = "$lastId{section}-$lastId{question}"; + $buttons{'question'} = "$lastId{section}"; } if(!$s){ $html .= "
    "; @@ -489,14 +442,14 @@ $self->session->errorHandler->error(Dumper $var); elsif($lastType eq 'section'){ if(!$b){ $html .= "
    "; - $buttons{'question'} = "$lastId{section}-$lastId{question}"; + $buttons{'question'} = "$lastId{section}"; } if(!$s){ $html .= "
    "; $buttons{'section'} = "$lastId{section}"; } } -#$self->session->errorHandler->error($html); +$self->session->errorHandler->error($html); #address is the address of the focused object #buttons are the data to create the Add buttons @@ -505,7 +458,12 @@ $self->session->errorHandler->error(Dumper $var); #ids is a list of all ids passed in which are draggable (for adding events) #type is the object type my $return = {"address",$address,"buttons",\%buttons,"edithtml",$editHtml,"ddhtml",$html,"ids",\@ids,"type",$var->{type}}; +$self->session->errorHandler->error(Dumper $return); +eval{ $self->session->errorHandler->error(encode_json($return)); +}; +$self->session->errorHandler->error($@); + $self->session->errorHandler->error("Returning from loadSurvey"); return encode_json($return); } diff --git a/lib/WebGUI/Asset/Wobject/Survey/SurveyJSON.pm b/lib/WebGUI/Asset/Wobject/Survey/SurveyJSON.pm index a43124815..a46bad487 100644 --- a/lib/WebGUI/Asset/Wobject/Survey/SurveyJSON.pm +++ b/lib/WebGUI/Asset/Wobject/Survey/SurveyJSON.pm @@ -1,97 +1,275 @@ package WebGUI::Asset::Wobject::Survey::SurveyJSON; use strict; -use Data::Structure::Util qw/unbless/; -use WebGUI::Asset::Wobject::Survey::SectionJSON; +use JSON; use Data::Dumper; sub new{ my $class = shift; - my $self = shift || {}; + my $json = shift; my $log = shift; - if(defined $self->{sections}){ - foreach(@{$self->{sections}}){ - $_ = WebGUI::Asset::Wobject::Survey::SectionJSON->new($_,undef,$log); - } - }else{ - $self->{sections} = []; - } + my $self = {}; $self->{log} = $log; + my $temp = decode_json($json) if defined $json; + $self->{sections} = defined $temp->{sections} ? $temp->{sections} : []; + $self->{survey} = defined $temp->{survey} ? $temp->{survey} : {}; + $self->{gotoMap} = defined $temp->{gotoMap} ? $temp->{gotoMap} : {}; bless($self,$class); + if(@{$self->sections} == 0){ + $self->newObject([]); + } return $self; } +sub freeze{ + my $self = shift; + my %temp; + $temp{sections} = $self->{sections}; + $temp{survey} = $self->{survey}; + $temp{gotoMap} = $self->{gotoMap}; + return encode_json(\%temp); +} +sub newObject{ + my $self = shift; + my $address = shift; + if(@$address == 0){ + push(@{$self->sections}, $self->newSection()); + return [$#{$self->sections}]; + }elsif(@$address == 1){ + push( @{$self->questions($address)}, $self->newQuestion($address)); + $$address[1] = $#{$self->questions($address)}; + return $address; + }elsif(@$address == 2){ + push(@{$self->answers($address)}, $self->newAnswer($address)); + $$address[2] = $#{$self->answers($$address)}; + return $address; + } +} + +#address is the array of objects currently selected in the edit screen +#data is the array of hash items for displaying +sub getDragDropList{ + my $self = shift; + my $address = shift; + my @data; +$self->log("dd'ing sections".$#{$self->sections}); +eval{ + for(my $i = 0; $i <= $#{$self->sections}; $i++){ + push(@data,{text=>$self->section([$i])->{title}, type=>'section'}); + if($address->[0] == $i){ + + for(my $x = 0; $x <= $#{$self->questions($address)}; $x++){ +$self->log("dd'ing questions".$#{$self->questions}); + push(@data,{text=>$self->question([$i,$x])->{text}, type=>'question'}); + if($address->[1] == $x){ + for(my $y = 0; $y <= $#{$self->answers($address)}; $y++){ +$self->log("dd'ing answers".$#{$self->answers}); + push(@data,{text=>$self->answer([$i,$x,$y])->{text}, type=>'answer'}); + } + } + } + } + } +}; +$self->log($@); +$self->log('finished dding'); + return \@data; +} + +sub getObject{ + my ($self,$address) = @_; + if(@$address == 1){ + return $self->{sections}->[$address->[0]]; + }elsif(@$address == 2){ + return $self->{sections}->[$address->[0]]->{questions}->[$address->[1]]; + }else{ + return $self->{sections}->[$address->[0]]->{questions}->[$address->[1]]->{answers}->[$address->[2]]; + } +} + +sub getEditVars{ + my ($self,$address) = @_; + + if(@$address == 1){ + return $self->getSectionEditVars($address); + }elsif(@$address == 2){ + return $self->getQuestionEditVars($address); + }elsif(@$address == 3){ + return $self->getAnswerEditVars($address); + } +} +sub getSectionEditVars{ + my $self = shift; + my $address = shift; + my $object = $self->section($address); + my %var = %{$object}; + $var{id} = $address->[0]; + $var{displayed_id} = $address->[0]+1; + delete $var{questions}; + delete $var{questionsPerPage}; + for(1 .. 10){ +# if($_ == $self->section($address)->{questionsPerPage}){ + if($_ == $object->{questionsPerPage}){ + push(@{$var{questionsPerPage}},{'index',$_,'selected',1}); + }else{ + push(@{$var{questionsPerPage}},{'index',$_,'selected',0}); + } + } + return \%var; +} +sub getQuestionEditVars{ + my $self = shift; + my $address = shift; + my $object = $self->question($address); + my %var = %{$object}; + $var{id} = $address->[0]."-".$address->[1]; + $var{displayed_id} = $address->[1]+1; + delete $var{answers}; + delete $var{questionType}; + my @types = ('Agree/Disagree','Certainty','Concern','Confidence','Currency','Date','Date Range','Dual Slider - Range','Education','Effectiveness', + 'Email','File Upload','Gender','Hidden','Ideology','Importance','Likelihood','Multi Slider - Allocate','Multiple Choice','Oppose/Support', + 'Party','Phone Number','Race','Risk','Satisfaction','Scale','Security','Slider','Text','Text Date','Threat','True/False','Yes/No'); + for(@types){ + if($_ eq $object->{questionType}){ + push(@{$var{questionType}},{'text',$_,'selected',1}); + }else{ + push(@{$var{questionType}},{'text',$_,'selected',0}); + } + } + return \%var; +} +sub getAnswerEditVars{ +} + +sub update{ + my ($self,$address,$ref) = @_; + my $object; + if(@$address == 1){ + $object = $self->section($address); + if(! defined $object){ + $object = $self->newSection(); + push(@{$self->sections},$object); + } + }elsif(@$address == 2){ + $object = $self->question($address); + if(! defined $object){ +$self->log("$object didn't exist"); + $object = $self->newQuestion(); + push(@{$self->questions($address)},$object); + } + }elsif(@$address == 3){ + } + for my $key(keys %$object){ + $object->{$key} = $ref->{$key} if(defined $$ref{$key}); + } +} +#determine what to add and add it. +# ref should contain all the information for the new +sub insertObject{ + my ($self,$object,$address) = @_; + + if(@$address == 1){ + splice(@{$self->sections($address)},$$address[0] + 1, 0, $object); + }elsif(@$address == 2) + splice(@{$self->questions($address)},$$address[1] + 1, 0, $object); + }elsif(@$address == 3) + splice(@{$self->answers($address)},$$address[2] + 1, 0, $object); + } + +} +sub remove{ + my ($self,$address,$movingOverride) = @_; + if(@$address == 1){ + splice(@{$self->{sections}},$$address[0],1) if($$address[0] != 0 and ! defined $movingOverride);#can't delete the first section + }elsif(@$address == 2){ +$self->log('removing here'); + splice(@{$self->questions($address)},$$address[1],1); + + }elsif(@$address == 3){ + } +} + +sub newSection{ + my %members = ( + 'text', '', + 'title', 'NEW SECTION', + 'variable', '', + 'questionsPerPage', 5, + 'questionsOnSectionPage', 1, + 'randomizeQuestions', 0, + 'everyPageTitle', 1, + 'everyPageText', 1, + 'terminal', 0, + 'terminalUrl', '', + 'goto', '', + 'timeLimit', 0, + 'type','section' + ); + $members{questions} = []; + return \%members; +} +sub newQuestion{ + my %members = ( + 'text', '', + 'variable','', + 'allowComment',0, + 'commentCols',10, + 'commentRows',5, + 'randomizeAnswers',0, + 'questionType','Multiple Choice', + 'randomWords','', + 'verticalDisplay',0, + 'required',0, + 'maxAnswers',1, + 'value',1, + 'textInButton',0, + 'terminal',0, + 'terminalUrl','', + 'type','question' + ); + $members{answers} = []; + return \%members; +} +sub newAnswer{ +} + + + +#------------------------------ +#accessors and helpers +#------------------------------ +sub sections{ + my $self = shift; + return $self->{sections}; +} +sub section{ + my $self = shift; + my $address = shift; + return $self->{sections}->[$$address[0]]; +} +sub questions{ + my $self = shift; + my $address = shift; + return $self->{sections}->[$$address[0]]->{questions}; +} +sub question{ + my $self = shift; + my $address = shift; + return $self->{sections}->[$$address[0]]->{questions}->[$$address[1]]; +} +sub answers{ + my $self = shift; + my $address = shift; + return $self->{sections}->[$$address[0]]->{questions}->[$$address[1]]->{answers}; +} +sub answer{ + my $self = shift; + my $address = shift; + return $self->{sections}->[$$address[0]]->{questions}->[$$address[1]]->{answers}->[$$address[2]]; +} sub log{ my ($self,$message) = @_; if(defined $self->{log}){ $self->{log}->error($message); } } -#address is the array of objects currently selected in the edit screen -#data is the array of hash items for displaying -sub getDragDropList{ - my $self = shift; - my $address = shift; - my $data = shift; - $self->{log} = shift; - for(my $i=0; $i<=$#{$self->{sections}}; $i++){ - $self->{sections}->[$i]->getDragDropList($data, $address, $i == $address->[0]); - } -} - -sub getObject{ - my ($self,$address) = @_; - if(@$address == 1){ - return $self->{sections}->[$address->[0]]; - }else{ - return $self->{sections}->[$address->[0]]->getObject($address); - } -} - -sub getEditVars{ - my ($self,$address) = @_; -$self->{log}->error("SurveyJSON geteditvars for: ".@$address); - return $self->{sections}->[$address->[0]]->getEditVars($address); -} - -sub update{ - my ($self,$address,$ref,$log) = @_; - if(ref $address eq 'ARRAY' and $$address[0] ne 'NEW'){ -$log->error('Address an array and sectionid not equal to NEW') if(defined $log); - $self->{sections}->[$$ref{ids}->[0]]->update($address,$ref,$log); - }else{ -$log->error('Either address not an array or sectionid equal to NEW') if(defined $log); - push(@{$self->{sections}}, WebGUI::Asset::Wobject::Survey::SectionJSON->new({},$ref)); - } -} -#determine what to add and add it. -# ref should contain all the information for the new - -sub remove{ - my ($self,$address) = @_; - if(@$address == 1){ - splice(@{$self->{sections}},$$address[0],1) if($$address[0] != 0);#can't delete the first section - }else{ - $self->{sections}->[$address->[0]]->remove($address); - } -} - -sub createTemp{ - my ($self,$ref) = @_;#ref{ids} contains the parent of the temp object which should be created and returned. - - if(ref $$ref{ids} eq 'ARRAY'){ - return $self->{sections}->[$$ref{ids}->[0]]->createTemp($ref); - }else{ - return WebGUI::Asset::Wobject::Survey::SectionJSON->new($self); - } -} -sub freeze{ - my ($self) = @_; - my %temp = %{$self}; - $temp{sections} = []; - foreach (@{$self->{sections}}){ - push(@{$temp{sections}},$_->freeze()); - } - delete $temp{log}; - return \%temp; -} 1; diff --git a/www/extras/wobject/Survey/editsurvey.js b/www/extras/wobject/Survey/editsurvey.js index 61f885e82..1315acecc 100644 --- a/www/extras/wobject/Survey/editsurvey.js +++ b/www/extras/wobject/Survey/editsurvey.js @@ -9,7 +9,7 @@ Survey.Data = new function(){ this.dragDrop = function(did){ var type; - +console.log('In drag drop'); if(did.className.match("section")){type = 'section';} else if(did.className.match("question")){type = 'question';} else{ type = 'answer';} @@ -32,7 +32,7 @@ Survey.Data = new function(){ else{ type = 'answer';} data = {id:before.id,type:type}; } - +console.log(first.id+' '+data.id); Survey.Comm.dragDrop(first,data); } @@ -50,7 +50,9 @@ Survey.Data = new function(){ //add event handlers for if a tag is clicked for(var x in d.ids){ +console.log('adding handler for '+ d.ids[x]); YAHOO.util.Event.addListener(d.ids[x], "click", this.clicked); + new Survey.DDList(d.ids[x],"sections"); } //add the add object buttons @@ -64,7 +66,7 @@ Survey.Data = new function(){ } if(d.buttons['answer']){ var button = new YAHOO.widget.Button({ label:"Add Answer", id:"addanswer", container:"newAnswer" }); - button.on("click", this.addQuestion,d.buttons['answer']); + button.on("click", this.addAnswer,d.buttons['answer']); } this.loadObjectEdit(d.edithtml,d.type); @@ -76,12 +78,12 @@ Survey.Data = new function(){ } - this.addQuestion = function(e,sid){ - Survey.Comm.newQuestion(sid); + this.addQuestion = function(e,id){ + Survey.Comm.newQuestion(id); } - this.addAnswer = function(e,ids){ - Survey.Comm.newAnswer(ids[0],ids[1]); + this.addAnswer = function(e,id){ + Survey.Comm.newAnswer(id); } this.loadObjectEdit = function(edit,type){ diff --git a/www/extras/wobject/Survey/editsurvey/comm.js b/www/extras/wobject/Survey/editsurvey/comm.js index 5fd5c677b..a4c4b760d 100644 --- a/www/extras/wobject/Survey/editsurvey/comm.js +++ b/www/extras/wobject/Survey/editsurvey/comm.js @@ -44,17 +44,17 @@ Survey.Comm = new function(){ request(sUrl,this.callback,postData); } this.newSection = function(){ - var sUrl = "?func=newSection"; + var sUrl = "?func=newObject"; request(sUrl,this.callback); } - this.newQuestion = function(sid){ - var postData = "data="+sid; - var sUrl = "?func=newQuestion"; + this.newQuestion = function(id){ + var postData = "data="+id; + var sUrl = "?func=newObject"; request(sUrl,this.callback,postData); } - this.newAnswer = function(sid,qid){ - var postData = "data="+YAHOO.lang.JSON.stringify([sid,qid]); - var sUrl = "?func=newAnswer"; + this.newAnswer = function(id){ + var postData = "data="+id; + var sUrl = "?func=newObject"; request(sUrl,this.callback,postData); } this.deleteAnswer = function(id){ diff --git a/www/extras/wobject/Survey/editsurvey/object.js b/www/extras/wobject/Survey/editsurvey/object.js index c9eb2d38f..7c7090178 100644 --- a/www/extras/wobject/Survey/editsurvey/object.js +++ b/www/extras/wobject/Survey/editsurvey/object.js @@ -13,7 +13,8 @@ Survey.ObjectTemplate = new function(){ ]; var form = new YAHOO.widget.Dialog(type, - { width : "500px", + { + width : "500px", fixedcenter : true, visible : false, constraintoviewport : true, diff --git a/www/extras/wobject/editsurvey.js b/www/extras/wobject/editsurvey.js index 16e8aafc3..a449d914e 100644 --- a/www/extras/wobject/editsurvey.js +++ b/www/extras/wobject/editsurvey.js @@ -66,7 +66,7 @@ Survey.Data = new function(){ else if(lastType == 'answer' && d.data[x].type == 'section'){ this.addAnswerButton(lastId['section'],lastId['question']); buttons['answer'] = 1; - this.addQuestionButton(lastId['section']); +// this.addQuestionButton(lastId['section']); buttons['question'] = 1; acount = 1; qcount = 1; @@ -135,16 +135,16 @@ Survey.Data = new function(){ } if(lastType == 'answer' && ! buttons['answer']){ this.addAnswerButton(lastId['section'],lastId['question']); - this.addQuestionButton(lastId['section']); +// this.addQuestionButton(lastId['section']); } if(lastType == 'question' && ! buttons['question']){ this.addAnswerButton(lastId['section'],lastId['question']); } if(lastType == 'question' || lastType == 'section' && ! buttons['question']){ - this.addQuestionButton(lastId['section']); +// this.addQuestionButton(lastId['section']); } - this.addSectionButton(); +// this.addSectionButton(); this.loadObjectEdit(d.edit); lastDataSet = d; @@ -157,7 +157,7 @@ Survey.Data = new function(){ this.addQuestion = function(e,sid){ - Survey.Comm.newQuestion(sid); +// Survey.Comm.newQuestion(sid); } this.addAnswer = function(e,ids){