Subversion Repositories public

Rev

Rev 4 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 4 Rev 40
Line 107... Line 107...
107
 
107
 
108
	   if (!$ist_future) {
108
	   if (!$ist_future) {
109
	      $query .= "(ta_start <= $bis or ";
109
	      $query .= "(ta_start <= $bis or ";
110
	   } else {
110
	   } else {
111
	      $query .= "(ta_start between $von and $bis or ";
111
	      $query .= "(ta_start between $von and $bis or ";
112
	      $query .= "ta_start+ta_duration*86400 between $von and $bis or ";
112
	      $query .= "ta_start+ta_duration::int8*86400 between $von and $bis or ";
113
	      $query .= "$von between ta_start and ta_start+ta_duration*86400 or ";
113
	      $query .= "$von between ta_start and ta_start+ta_duration::int8*86400 or ";
114
	      $query .= "$bis between ta_start and ta_start+ta_duration*86400 or ";
114
	      $query .= "$bis between ta_start and ta_start+ta_duration::int8*86400 or ";
115
	   }
115
	   }
116
 
116
 
117
	   $query .= "ta_num in (select distinct wd_task from wdone where ";
117
	   $query .= "ta_num in (select distinct wd_task from wdone where ";
118
	   $query .= "wd_minum = $minum and wd_prnum = $pr_num and ";
118
	   $query .= "wd_minum = $minum and wd_prnum = $pr_num and ";
119
	   $query .= "wd_datum between $von and $bis)) ";
119
	   $query .= "wd_datum between $von and $bis)) ";
Line 949... Line 949...
949
	$dbis = gmmktime(0, 0, 0, $mon, $day, $year);
949
	$dbis = gmmktime(0, 0, 0, $mon, $day, $year);
950
	echo " " . GetMessage($db, 246, "Bis:") . " <input type=\"text\" name=\"bis\" value=\"";
950
	echo " " . GetMessage($db, 246, "Bis:") . " <input type=\"text\" name=\"bis\" value=\"";
951
	$vd = gmdate($dtformatshort, $dbis);
951
	$vd = gmdate($dtformatshort, $dbis);
952
	echo "$vd\" size=10 maxlength=10 onBlur=\"javascript:CheckDate(this,0)\"></td>\n";
952
	echo "$vd\" size=10 maxlength=10 onBlur=\"javascript:CheckDate(this,0)\"></td>\n";
953
	echo "<td>";
953
	echo "<td>";
954
	ButtonImageMove("left.png", GetMessage($db, 374, "Woche zurück"), "ist.php", "func=PrevWeek&$nav");
954
	ButtonImageMove("left.png", GetMessage($db, 374, "Woche zur�ck"), "ist.php", "func=PrevWeek&$nav");
955
	echo "</td><td>";
955
	echo "</td><td>";
956
	ButtonImageMove("right.png", GetMessage($db, 375, "Woche vor"), "ist.php", "func=NextWeek&$nav");
956
	ButtonImageMove("right.png", GetMessage($db, 375, "Woche vor"), "ist.php", "func=NextWeek&$nav");
957
	echo "</td><td>";
957
	echo "</td><td>";
958
	ButtonImageMove("today.png", GetMessage($db, 249, "Heute"), "ist.php", "func=Today&$nav");
958
	ButtonImageMove("today.png", GetMessage($db, 249, "Heute"), "ist.php", "func=Today&$nav");
959
	echo "</td><td>";
959
	echo "</td><td>";
Line 1076... Line 1076...
1076
 
1076
 
1077
	      if (!$ist_future) {
1077
	      if (!$ist_future) {
1078
	         $query .= "ta_start <= $dbis and ";
1078
	         $query .= "ta_start <= $dbis and ";
1079
	      } else {
1079
	      } else {
1080
	         $query .= "(ta_start between $dvon and $dbis or ";
1080
	         $query .= "(ta_start between $dvon and $dbis or ";
1081
	         $query .= "ta_start+ta_duration*86400 between $dvon and $dbis or ";
1081
	         $query .= "ta_start+ta_duration::int8*86400 between $dvon and $dbis or ";
1082
	         $query .= "$dvon between ta_start and ta_start+ta_duration*86400 or ";
1082
	         $query .= "$dvon between ta_start and ta_start+ta_duration::int8*86400 or ";
1083
	         $query .= "$dbis between ta_start and ta_start+ta_duration*86400) and ";
1083
	         $query .= "$dbis between ta_start and ta_start+ta_duration::int8*86400) and ";
1084
	      }
1084
	      }
1085
 
1085
 
1086
//	      $query .= "ta_plnum = $pl_num and ";
1086
//	      $query .= "ta_plnum = $pl_num and ";
1087
	      $query .= "pl_prnum = $pr_num ";
1087
	      $query .= "pl_prnum = $pr_num ";
1088
 
1088
 
Line 1139... Line 1139...
1139
 
1139
 
1140
		 if (!$ist_future) {
1140
		 if (!$ist_future) {
1141
		    $query .= "ta_start <= $dbis ";
1141
		    $query .= "ta_start <= $dbis ";
1142
		 } else {
1142
		 } else {
1143
		    $query .= "(ta_start between $dvon and $dbis or ";
1143
		    $query .= "(ta_start between $dvon and $dbis or ";
1144
		    $query .= "ta_start+ta_duration*86400 between $dvon and $dbis or ";
1144
		    $query .= "ta_start+ta_duration::int8*86400 between $dvon and $dbis or ";
1145
		    $query .= "$dvon between ta_start and ta_start+ta_duration*86400 or ";
1145
		    $query .= "$dvon between ta_start and ta_start+ta_duration::int8*86400 or ";
1146
		    $query .= "$dbis between ta_start and ta_start+ta_duration*86400) ";
1146
		    $query .= "$dbis between ta_start and ta_start+ta_duration::int8*86400) ";
1147
		 }
1147
		 }
1148
 
1148
 
1149
		 $query .= "inner join plan on pl_num = ta_plnum and pl_prnum = $pr_num and pl_status in (2,3,4,5,6) ";
1149
		 $query .= "inner join plan on pl_num = ta_plnum and pl_prnum = $pr_num and pl_status in (2,3,4,5,6) ";
1150
		 $query .= "order by al_ressource, pl_lfd desc, mi_nname, mi_vname";
1150
		 $query .= "order by al_ressource, pl_lfd desc, mi_nname, mi_vname";
1151
	      } else {
1151
	      } else {