Subversion Repositories public

Compare Revisions

Ignore whitespace Rev 4 → Rev 39

/pm/trunk/istpm.php
125,9 → 125,9
$query .= "ta_start <= $bis ";
} else {
$query .= "(ta_start between $von and $bis or ";
$query .= "ta_start+ta_duration*86400 between $von and $bis or ";
$query .= "$von between ta_start and ta_start+ta_duration*86400 or ";
$query .= "$bis between ta_start and ta_start+ta_duration*86400 or ";
$query .= "ta_start+ta_duration::int8*86400 between $von and $bis or ";
$query .= "$von between ta_start and ta_start+ta_duration::int8*86400 or ";
$query .= "$bis between ta_start and ta_start+ta_duration::int8*86400 or ";
$query .= "ta_num in (select distinct wd_task from wdone where ";
$query .= "wd_minum = $minum and wd_prnum = $pr_num and ";
$query .= "wd_datum between $von and $bis)) ";
1117,7 → 1117,7
$dto = $dbis;
 
echo "<td>";
ButtonImageMove("left.png", GetMessage($db, 247, "Woche zurück"), "istpm.php", "func=PrevWeek&$nav");
ButtonImageMove("left.png", GetMessage($db, 247, "Woche zur�ck"), "istpm.php", "func=PrevWeek&$nav");
echo "</td><td>";
ButtonImageMove("right.png", GetMessage($db, 248, "Woche vor"), "istpm.php", "func=NextWeek&$nav");
echo "</td><td>";
1248,9 → 1248,9
$query .= "ta_start <= $dbis and ";
} else {
$query .= "(ta_start between $dvon and $dbis or ";
$query .= "ta_start+ta_duration*86400 between $dvon and $dbis or ";
$query .= "$dvon between ta_start and ta_start+ta_duration*86400 or ";
$query .= "$dbis between ta_start and ta_start+ta_duration*86400) and ";
$query .= "ta_start+ta_duration::int8*86400 between $dvon and $dbis or ";
$query .= "$dvon between ta_start and ta_start+ta_duration::int8*86400 or ";
$query .= "$dbis between ta_start and ta_start+ta_duration::int8*86400) and ";
}
 
$query .= "(ta_plnum = $pl_num or ta_plnum in (";
1336,9 → 1336,9
$query .= "ta_start <= $dbis ";
} else {
$query .= "(ta_start between $dvon and $dbis or ";
$query .= "ta_start+ta_duration*86400 between $dvon and $dbis or ";
$query .= "$dvon between ta_start and ta_start+ta_duration*86400 or ";
$query .= "$dbis between ta_start and ta_start+ta_duration*86400) ";
$query .= "ta_start+ta_duration::int8*86400 between $dvon and $dbis or ";
$query .= "$dvon between ta_start and ta_start+ta_duration::int8*86400 or ";
$query .= "$dbis between ta_start and ta_start+ta_duration::int8*86400) ";
}
 
$query .= "inner join plan on pl_num = ta_plnum and pl_prnum = $pr_num and pl_status in (2,3,4,5,6) ";