32c32
< $self->{firstfid} = 0;
---
> $self->{firstfid} = 1;
59d58
< $self->loadordernum();
64,82d62
< #### Laden der Umfrage aus der DB
< #### Argumente : -
< #### Returnwert : -
< ####################################################################
< sub loadordernum {
< my $self = shift;
< my %ordernums=(-1 => "Ende", 0 => "Nächste");
< my @lordernum=(-1,0);
< my $sth=$self->sqlprepare("select fid, ordernum from fragen where umfid='$self->{id}' order by ordernum,fid");
< while (my ($fid, $ordernum) = $sth->fetchrow_array()) {
< if ($ordernum eq "") {$ordernum=$fid}
< $ordernums{$fid}=$ordernum;
< push @lordernum,$fid;
< }
< $baseq::RHordernums=\%ordernums;
< $baseq::RLordernums=\@lordernum;
< }
<
< ####################################################################
90d69
< $self->sqldo("lock tables umfragen");
101d79
< $self->sqldo("unlock tables umfragen");
168c146
< my $sql = "select * from fragen where umfid=$self->{id} order by ordernum, fid";
---
> my $sql = "select * from fragen where umfid=$self->{id}";
221d198
< if ($baseq::VARS{fid} == 0) {($baseq::VARS{fid})=$self->sqlselect("select fid from fragen where umfid='$self->{id}' order by ordernum,fid");}
302d278
< $self->loadordernum();
305c281
< my $fl=$self->loadfragen;
---
> my $f; my $fl=$self->loadfragen;
307,308c283,284
< my $HTML="
\n";
< foreach (@$fl) { $HTML.=$_->fragenliste; }
---
> my $HTML=$self->sfont($self->trans("HI43")." ".$self->{firstfid})."
\n\n";
> while ($f = shift @$fl) { $HTML.=$f->fragenliste; }
328c304
< my $sth=$self->sqlprepare("select fid,ordernum, frage from fragen where umfid='$self->{id}' order by ordernum,fid");
---
> my $sth=$self->sqlprepare("select fid, frage from fragen where umfid='$self->{id}'");
330,331c306,307
< $x[2]=~s/<[^>]+[>\$]//g;
< $flist{$x[0]}="($x[1]) ".substr($x[2], 0, 40);
---
> $x[1]=~s/<[^>]+[>\$]//g;
> $flist{$x[0]}="($x[0]) ".substr($x[1], 0, 40);
368a345
> $self->TR([ $self->sfont($self->trans("HI17b")), $self->TF("firstfid",$self->{firstfid},5), $self->SM("but", "BU6") ]).
370c347
< $self->DD('uspringen',[1,0],$self->{uspringen},{"1" => "Anzeigen","0"=>"Verstecken"}), $self->SM("but", "BU6") ]).
---
> $self->DD('uspringen',[1,0],$self->{uspringen},{"1" => "Anzeigen","0"=>"Verstecken"}) ]).
410d386
< $self->loadordernum();
438d413
< $self->loadordernum();
455d429
< $self->loadordernum();
607d580
< $self->sqldo("delete from bar where changed < NOW()-100000");
614c587
< @table, @where, $target, $details, @pinselect, $alles);
---
> @table, @where, $target, $details, @pinselect, $alles, @hiddenpin);
620c593
< elsif (/^U\d+F\d+A\d+PIN(\d{1,5})$/) { # er/sie hat einzelne PINs selektiert
---
> elsif (/^(U\d+F\d+A\d+PIN(\d{1,5}))$/) { # er/sie hat einzelne PINs selektiert
622c595,596
< push @pinselect, "a.pin=$1";
---
> push @pinselect, "a.pin=$2";
> push @hiddenpin, $1;
624a599
> $self->{statselpin}=\@hiddenpin;
640d614
< $self->{statpinselect}=[];
641a616
> $self->{statselpin}=[];
647d621
< ($self->{tableref}, $self->{whereref}) = ($tableref, $whereref);
651a626
> ($self->{tableref}, $self->{whereref}) = ($tableref, $whereref);
681,683c656
< if ($shortcutf[$fid]->{showstat}) {
< $self->{benutzer}->{FID}[$fid]++; #und aufaddieren wenn Statistik gezeigt werden soll
< }
---
> $self->{benutzer}->{FID}[$fid]++; #und aufaddieren
780c753
< $name=$_->fullname;
---
> $name=$_->{name};
782,783c755
< $flist{$_->{id}}=substr($name,0,45);
< push @alist,$_->{id};
---
> $flist{$_->{id}}="(".$_->{id}.") ".substr($name,0,40);
788a761
> @alist=(sort {$a <=> $b} keys %flist);
908a882
> $x->{txt}="";
910c884
< $grdata{textformatv}="Frage: &T";
---
> $grdata{textformatv}="Frage: &L";
912d885
< $grdata{sorttype}="txt";
916d888
< if ($tmpa[$_]==0) {next;}
918c890
< $x->{txt}=$baseq::RHordernums->{$_};
---
> if ($tmpa[$_]==0) {next;}
921c893
< $x->{descr}=$baseq::TITLE{$typ}.": Frage ".$tmpa[$_];
---
> $x->{descr}=$baseq::TITLE{$typ}.": Frage ".$tmpa[$_];