Subversion Repositories public

Compare Revisions

Ignore whitespace Rev 39 → Rev 40

/pm/trunk/ist.php
109,9 → 109,9
$query .= "(ta_start <= $bis or ";
} 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 ";
951,7 → 951,7
$vd = gmdate($dtformatshort, $dbis);
echo "$vd\" size=10 maxlength=10 onBlur=\"javascript:CheckDate(this,0)\"></td>\n";
echo "<td>";
ButtonImageMove("left.png", GetMessage($db, 374, "Woche zurück"), "ist.php", "func=PrevWeek&$nav");
ButtonImageMove("left.png", GetMessage($db, 374, "Woche zur�ck"), "ist.php", "func=PrevWeek&$nav");
echo "</td><td>";
ButtonImageMove("right.png", GetMessage($db, 375, "Woche vor"), "ist.php", "func=NextWeek&$nav");
echo "</td><td>";
1078,9 → 1078,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 and ";
1141,9 → 1141,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) ";