mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-25 17:33:49 +01:00
New Matrix View
This commit is contained in:
parent
329e49904b
commit
55aa6f9d1a
@ -49,7 +49,7 @@
|
||||
$phpgw->template->set_block("matrix_query_begin","list","matrix_query_end","form_button");
|
||||
|
||||
$phpgw->template->set_var("matrix_action",lang("Daily Matrix View"));
|
||||
$phpgw->template->set_var("action_url",$phpgw->link("timematrix.php"));
|
||||
$phpgw->template->set_var("action_url",$phpgw->link("viewmatrix.php"));
|
||||
|
||||
$phpgw->template->parse("out","matrix_query_begin");
|
||||
|
||||
@ -63,7 +63,7 @@
|
||||
|
||||
$month_html = "<select name=\"month\">";
|
||||
for ($i = 1; $i <= 12; $i++) {
|
||||
$m = lang(date("F", mktime(0,0,0,$i,1,$cal_info->year)));
|
||||
$m = lang(date("F", mktime(0,0,0,$i,1,$thisyear)));
|
||||
$month_html .= "<option value=\"$i\"" . ($i == $thismonth ? " selected" : "") . ">$m"
|
||||
. "</option>\n";
|
||||
}
|
||||
@ -79,6 +79,15 @@
|
||||
$phpgw->template->set_var("data",$phpgw->common->dateformatorder($year_html,$month_html,$day_html));
|
||||
$phpgw->template->parse("output","list",True);
|
||||
|
||||
$phpgw->template->set_var("field",lang("View"));
|
||||
$str = "<select name=\"view\">";
|
||||
$str .= "<option value=\"free/busy\">".lang("Free/Busy").</option>\n";
|
||||
$str .= "<option value=\"weekly\">".lang("Weekly")."</option>\n";
|
||||
$str .= "</select>\n";
|
||||
$phpgw->template->set_var("data",$str);
|
||||
$phpgw->template->parse("output","list",True);
|
||||
|
||||
|
||||
$phpgw->template->set_var("field",lang("Participants"));
|
||||
$db2 = $phpgw->db;
|
||||
$db2->query("select account_id,account_lastname,account_firstname "
|
||||
|
@ -3,7 +3,7 @@
|
||||
<center>
|
||||
<h2><font color="#000000">{matrix_action}</font></h2>
|
||||
|
||||
<form action="{action_url}" method="post" name="matrixform" target="timematrix">
|
||||
<form action="{action_url}" method="post" name="matrixform" target="viewmatrix">
|
||||
<table border="0" width="75%">
|
||||
<!-- END matrix_query_begin -->
|
||||
|
||||
|
@ -38,10 +38,18 @@
|
||||
|
||||
$date = $thisyear.$thismonth.$thisday;
|
||||
|
||||
switch($view) {
|
||||
case "free/busy" :
|
||||
echo $phpgw->calendar->timematrix($phpgw->calendar->date_to_epoch($date),0,0,$participants);
|
||||
break;
|
||||
case "weekly" :
|
||||
echo $phpgw->calendar->display_large_week($thisday,$thismonth,$thisyear,true,$participants);
|
||||
break;
|
||||
}
|
||||
echo "<center>";
|
||||
echo "<form action=\"".$phpgw->link("timematrix.php")."\" method=\"post\" name=\"matrixform\" target=\"timematrix\">";
|
||||
echo "<form action=\"".$phpgw->link("viewmatrix.php")."\" method=\"post\" name=\"matrixform\" target=\"viewmatrix\">";
|
||||
echo "<input type=\"hidden\" name=\"date\" value=\"".$date."\">";
|
||||
echo "<input type=\"hidden\" name=\"view\" value=\"".$view."\">";
|
||||
for ($i=0;$i<count($participants);$i++)
|
||||
echo "<input type=\"hidden\" name=\"participants[]\" value=\"".$participants[$i]."\">";
|
||||
echo "<input type=\"submit\" value=\"Refresh\">";
|
@ -146,6 +146,7 @@ folder email en Folder
|
||||
forum common en Forum
|
||||
forward email en Forward
|
||||
fr calendar en F
|
||||
free/busy calendar en Free/Busy
|
||||
frequency calendar en Frequency
|
||||
fri calendar en Fri
|
||||
friday common en Friday
|
||||
|
Loading…
Reference in New Issue
Block a user