Subversion Repositories public

Rev

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

Rev 4 Rev 39
Line 123... Line 123...
123
 
123
 
124
	   if (!$ist_future) {
124
	   if (!$ist_future) {
125
	      $query .= "ta_start <= $bis ";
125
	      $query .= "ta_start <= $bis ";
126
	   } else {
126
	   } else {
127
	      $query .= "(ta_start between $von and $bis or ";
127
	      $query .= "(ta_start between $von and $bis or ";
128
	      $query .= "ta_start+ta_duration*86400 between $von and $bis or ";
128
	      $query .= "ta_start+ta_duration::int8*86400 between $von and $bis or ";
129
	      $query .= "$von between ta_start and ta_start+ta_duration*86400 or ";
129
	      $query .= "$von between ta_start and ta_start+ta_duration::int8*86400 or ";
130
	      $query .= "$bis between ta_start and ta_start+ta_duration*86400 or ";
130
	      $query .= "$bis between ta_start and ta_start+ta_duration::int8*86400 or ";
131
	      $query .= "ta_num in (select distinct wd_task from wdone where ";
131
	      $query .= "ta_num in (select distinct wd_task from wdone where ";
132
	      $query .= "wd_minum = $minum and wd_prnum = $pr_num and ";
132
	      $query .= "wd_minum = $minum and wd_prnum = $pr_num and ";
133
	      $query .= "wd_datum between $von and $bis)) ";
133
	      $query .= "wd_datum between $von and $bis)) ";
134
	   }
134
	   }
135
 
135
 
Line 1115... Line 1115...
1115
	$vd = GetShortDate($dbis);
1115
	$vd = GetShortDate($dbis);
1116
	echo "$vd\" size=7 maxlength=7 onBlur=\"javascript:CheckDate(this,1)\"></td>\n";
1116
	echo "$vd\" size=7 maxlength=7 onBlur=\"javascript:CheckDate(this,1)\"></td>\n";
1117
	$dto = $dbis;
1117
	$dto = $dbis;
1118
 
1118
 
1119
	echo "<td>";
1119
	echo "<td>";
1120
	ButtonImageMove("left.png", GetMessage($db, 247, "Woche zurück"), "istpm.php", "func=PrevWeek&$nav");
1120
	ButtonImageMove("left.png", GetMessage($db, 247, "Woche zur�ck"), "istpm.php", "func=PrevWeek&$nav");
1121
	echo "</td><td>";
1121
	echo "</td><td>";
1122
	ButtonImageMove("right.png", GetMessage($db, 248, "Woche vor"), "istpm.php", "func=NextWeek&$nav");
1122
	ButtonImageMove("right.png", GetMessage($db, 248, "Woche vor"), "istpm.php", "func=NextWeek&$nav");
1123
	echo "</td><td>";
1123
	echo "</td><td>";
1124
	ButtonImageMove("today.png", GetMessage($db, 249, "Heute"), "istpm.php", "func=Today&$nav");
1124
	ButtonImageMove("today.png", GetMessage($db, 249, "Heute"), "istpm.php", "func=Today&$nav");
1125
	echo "</td><td>";
1125
	echo "</td><td>";
Line 1246... Line 1246...
1246
 
1246
 
1247
	      if (!$ist_future) {
1247
	      if (!$ist_future) {
1248
	         $query .= "ta_start <= $dbis and ";
1248
	         $query .= "ta_start <= $dbis and ";
1249
	      } else {
1249
	      } else {
1250
	         $query .= "(ta_start between $dvon and $dbis or ";
1250
	         $query .= "(ta_start between $dvon and $dbis or ";
1251
	         $query .= "ta_start+ta_duration*86400 between $dvon and $dbis or ";
1251
	         $query .= "ta_start+ta_duration::int8*86400 between $dvon and $dbis or ";
1252
	         $query .= "$dvon between ta_start and ta_start+ta_duration*86400 or ";
1252
	         $query .= "$dvon between ta_start and ta_start+ta_duration::int8*86400 or ";
1253
	         $query .= "$dbis between ta_start and ta_start+ta_duration*86400) and ";
1253
	         $query .= "$dbis between ta_start and ta_start+ta_duration::int8*86400) and ";
1254
	      }
1254
	      }
1255
 
1255
 
1256
	      $query .= "(ta_plnum = $pl_num or ta_plnum in (";
1256
	      $query .= "(ta_plnum = $pl_num or ta_plnum in (";
1257
	      $query .= "select distinct pl_num from wdone, plan, task where ";
1257
	      $query .= "select distinct pl_num from wdone, plan, task where ";
1258
	      $query .= "ta_num = wd_task and pl_num = ta_plnum and ";
1258
	      $query .= "ta_num = wd_task and pl_num = ta_plnum and ";
Line 1334... Line 1334...
1334
 
1334
 
1335
		 if (!$ist_future) {
1335
		 if (!$ist_future) {
1336
		    $query .= "ta_start <= $dbis ";
1336
		    $query .= "ta_start <= $dbis ";
1337
		 } else {
1337
		 } else {
1338
		    $query .= "(ta_start between $dvon and $dbis or ";
1338
		    $query .= "(ta_start between $dvon and $dbis or ";
1339
		    $query .= "ta_start+ta_duration*86400 between $dvon and $dbis or ";
1339
		    $query .= "ta_start+ta_duration::int8*86400 between $dvon and $dbis or ";
1340
		    $query .= "$dvon between ta_start and ta_start+ta_duration*86400 or ";
1340
		    $query .= "$dvon between ta_start and ta_start+ta_duration::int8*86400 or ";
1341
		    $query .= "$dbis between ta_start and ta_start+ta_duration*86400) ";
1341
		    $query .= "$dbis between ta_start and ta_start+ta_duration::int8*86400) ";
1342
		 }
1342
		 }
1343
 
1343
 
1344
		 $query .= "inner join plan on pl_num = ta_plnum and pl_prnum = $pr_num and pl_status in (2,3,4,5,6) ";
1344
		 $query .= "inner join plan on pl_num = ta_plnum and pl_prnum = $pr_num and pl_status in (2,3,4,5,6) ";
1345
		 $query .= "order by al_ressource, pl_lfd desc, mi_nname, mi_vname";
1345
		 $query .= "order by al_ressource, pl_lfd desc, mi_nname, mi_vname";
1346
	      } else {
1346
	      } else {