Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 41a03969

Von Thomas Kasulke vor mehr als 17 Jahren hinzugefügt

  • ID 41a039692bf1d655df629fd833fd6d6d428eb29b
  • Vorgänger a52a1004
  • Nachfolger 0b280f98

Verbesserung der Suchfunktionen der Historie und Visualisierung der Sortierreihenfolge.

Unterschiede anzeigen:

bin/mozilla/am.pl
3061 3061
			$restriction .= " OR addition = '" . $_ . "'";
3062 3062
		}
3063 3063
	}
3064
	
3065 3064
	$restriction .= (($form->{transdate} ne "" && $form->{reqdate} ne "") 
3066 3065
						? qq| AND st.itime::date >= '| . $form->{transdate} . qq|' AND st.itime::date <= '| . $form->{reqdate} . qq|'|
3067 3066
						: (($form->{transdate} ne "" && $form->{reqdate} eq "") 
......
3071 3070
								: ""
3072 3071
							)
3073 3072
						);
3073
  $restriction .= ($form->{mitarbeiter} eq "" ? "" 
3074
          : ($form->{mitarbeiter} =~ /^[0-9]*$/  
3075
            ? " AND employee_id = " . $form->{mitarbeiter} 
3076
            : " AND employee_id = " . &get_employee_id($form->{mitarbeiter}, $dbh)));
3077
  
3074 3078
	my $dbh = $form->dbconnect(\%myconfig);
3075
	my $searchSNumber = $searchNo{$form->{'what2search'}} . qq|_| . $form->{'searchid'};
3076
	$restriction .= ($form->{mitarbeiter} eq "" ? "" 
3077
					: ($form->{mitarbeiter} =~ /^[0-9]*$/  
3078
						? " AND employee_id = " . $form->{mitarbeiter} 
3079
						: " AND employee_id = " . &get_employee_id($form->{mitarbeiter}, $dbh)));
3080
	my $query = qq|SELECT trans_id AS id FROM history_erp WHERE sNumbers = '$searchSNumber' |;
3079
	my $query = qq|SELECT trans_id AS id FROM history_erp | . 
3080
                ($form->{'searchid'} ? 
3081
                  qq| WHERE snumbers = '| . $searchNo{$form->{'what2search'}} . qq|_| . $form->{'searchid'} . qq|'| : 
3082
                  qq| WHERE snumbers ~ '^| . $searchNo{$form->{'what2search'}} . qq|'|);
3081 3083

  
3082 3084
  my $sth = $dbh->prepare($query);
3083 3085
	
3084 3086
	$sth->execute() || $form->dberror($query);
3085
	
3086
  if($sth->fetch() <= 0) {
3087
    $sth->finish();
3088
    my $query = qq|SELECT id FROM $search{$form->{what2search}} 
3089
           WHERE $searchNo{$form->{'what2search'}} ILIKE '$form->{"searchid"}' 
3090
           |;
3091
  }
3092
  $sth->execute() || $form->dberror($query);  
3093
	$form->{title} = $locale->text("History Search");
3087
  
3088
  $form->{title} = $locale->text("History Search");
3094 3089
	$form->header();
3095
	my $daten = "";
3096
	while(my $hash_ref = $sth->fetchrow_hashref()){
3097
    $daten =  $form->get_history($dbh,$hash_ref->{id},$restriction,$form->{order});
3090
	
3091
  my $i = 1;
3092
  my $daten = qq||;
3093
  while(my $hash_ref = $sth->fetchrow_hashref()){
3094
    if($i) {
3095
      $daten .= $hash_ref->{id};
3096
      $i = 0;
3097
    }
3098
    else {
3099
      $daten .= " OR trans_id = " . $hash_ref->{id};
3100
    }
3098 3101
  }
3099
	$dbh->disconnect();
3102
  
3103
  my ($sort, $sortby) = split(/\-\-/, $form->{order});
3104
  $sort =~ s/.*\.(.*)$/$1/;
3105

  
3100 3106
	print $form->parse_html_template("/common/show_history", 
3101
    {"DATEN" => $daten,
3102
     "SUCCESS" => ($daten != 0 ? 1 : 0),
3103
     "NONEWWINDOW" => 1
3107
    {"DATEN" => $form->get_history($dbh, $daten, $restriction, $form->{order}),
3108
     "SUCCESS" => ($form->get_history($dbh, $daten, $restriction, $form->{order}) ne "0"),
3109
     "NONEWWINDOW" => 1,
3110
     uc($sort) => 1,
3111
     uc($sort)."BY" => $sortby
3104 3112
    });
3105
	$lxdebug->leave_sub();
3113
	$dbh->disconnect();
3114
  $lxdebug->leave_sub();
3106 3115
}
3107 3116

  
3108 3117
sub get_employee_id {

Auch abrufbar als: Unified diff