| ';
-
- //print $langs->trans("Calendars").': ';
- //print ' | ';
$s.='' . "\n";
+ if (! empty($conf->use_javascript_ajax))
+ {
+ $s.=' ' . $langs->trans("LocalAgenda").' ';
+ if (is_array($showextcals) && count($showextcals) > 0)
+ {
+ foreach ($showextcals as $val)
+ {
+ $htmlname = dol_string_nospecial($val['name']);
+ $s.='' . "\n";
+ $s.=' ' . $val ['name'] . ' ';
+ }
+ }
+ }
+ //$s.=' '.$langs->trans("AgendaShowBirthdayEvents").' ';
+}
+
+
+
+$link='';
print_fiche_titre($s,$link.' '.$nav, '');
@@ -336,7 +367,7 @@ else
if ($type) $sql.= " AND ca.id = ".$type;
if ($status == '0') { $sql.= " AND a.percent = 0"; }
if ($status == '-1') { $sql.= " AND a.percent = -1"; } // Not applicable
-if ($status == '50') { $sql.= " AND (a.percent >= 0 AND a.percent < 100)"; } // Running
+if ($status == '50') { $sql.= " AND (a.percent > 0 AND a.percent < 100)"; } // Running already started
if ($status == 'done' || $status == '100') { $sql.= " AND (a.percent = 100 OR (a.percent = -1 AND a.datep2 <= '".$db->idate($now)."'))"; }
if ($status == 'todo') { $sql.= " AND ((a.percent >= 0 AND a.percent < 100) OR (a.percent = -1 AND a.datep2 > '".$db->idate($now)."'))"; }
if ($filtera > 0 || $filtert > 0 || $filterd > 0 || $usergroup > 0)
@@ -349,7 +380,7 @@ if ($filtera > 0 || $filtert > 0 || $filterd > 0 || $usergroup > 0)
$sql.= ")";
}
// Sort on date
-$sql.= ' ORDER BY datep';
+$sql.= ' ORDER BY fk_user_action, datep'; //fk_user_action
//print $sql;
dol_syslog("comm/action/index.php", LOG_DEBUG);
@@ -446,6 +477,7 @@ else
dol_print_error($db);
}
+
$maxnbofchar=18;
$cachethirdparties=array();
$cachecontacts=array();
@@ -459,22 +491,359 @@ if (is_readable($color_file))
if (! is_array($theme_datacolor)) $theme_datacolor=array(array(120,130,150), array(200,160,180), array(190,190,220));
+$newparam=$param; // newparam is for birthday links
+$newparam=preg_replace('/showbirthday=/i','showbirthday_=',$newparam); // To avoid replacement when replace day= is done
+$newparam=preg_replace('/action=show_month&?/i','',$newparam);
+$newparam=preg_replace('/action=show_week&?/i','',$newparam);
+$newparam=preg_replace('/day=[0-9]+&?/i','',$newparam);
+$newparam=preg_replace('/month=[0-9]+&?/i','',$newparam);
+$newparam=preg_replace('/year=[0-9]+&?/i','',$newparam);
+$newparam=preg_replace('/viewweek=[0-9]+&?/i','',$newparam);
+$newparam=preg_replace('/showbirthday_=/i','showbirthday=',$newparam); // Restore correct parameter
+$newparam.='&viewweek=1';
+
+echo '';
-/* TODO Export
- print '
-
-
-
+// Table :
+echo '';
+
+echo '';
+echo ' | ';
+$i=0;
+while ($i < 7)
+{
+ if (($i + 1) < $begin_d || ($i + 1) > $end_d)
+ {
+ $i++;
+ continue;
+ }
+ echo '';
+ echo $langs->trans("Day".(($i+(isset($conf->global->MAIN_START_WEEK)?$conf->global->MAIN_START_WEEK:1)) % 7));
+ print "
";
+ if ($i) print dol_print_date(dol_time_plus_duree($firstdaytoshow, $i, 'd'),'day');
+ else print dol_print_date($firstdaytoshow,'day');
+ echo " | \n";
+ $i++;
+}
+echo " \n";
+
+echo '';
+echo ' | ';
+$i=0;
+while ($i < 7)
+{
+ if (($i + 1) < $begin_d || ($i + 1) > $end_d)
+ {
+ $i++;
+ continue;
+ }
+ for ($h = $begin_h; $h < $end_h; $h++)
+ {
+ echo '';
+ print ''.sprintf("%02d",$h).'';
+ print " | ";
+ }
+ echo "\n";
+ $i++;
+}
+echo " \n";
+
+// Define $usernames
+$usernames = array(); //init
+/* Use this to have list of users only if users have events
+foreach ($eventarray as $daykey => $notused)
+{
+ $annee = date('Y',$daykey);
+ $mois = date('m',$daykey);
+ $jour = date('d',$daykey);
+ //if ($day==$jour && $month==$mois && $year==$annee)
+ //{
+ //Tout les events à la même date :
+ foreach ($eventarray[$daykey] as $index => $event)
+ {
+ $myuser = new User($db);
+ $user_id = $event->usertodo->id;
+ $myuser->fetch($user_id);
+ $username = $myuser->getFullName($langs);
+ if (! in_array($username, $usernames))
+ {
+ $usernames[] = $username;
+ }
+ }
+ //}
+}*/
+if ($filtert > 0)
+{
+ var_dump($filtert);
+ $tmpuser = new User($db);
+ $tmpuser->fetch($filtert);
+ $usernames[] = $tmpuser;
+}
+else if ($usergroup)
+{
+ $tmpgroup = new UserGroup($db);
+ $tmpgroup->fetch($usergroup);
+ $usernames = $tmpgroup->listUsersForGroup();
+}
+else
+{
+ $tmpgroup = new UserGroup($db);
+ //$tmpgroup->fetch($usergroup); No fetch, we want all users for all groups
+ $usernames = $tmpgroup->listUsersForGroup();
+}
+
+
+// Loop on each user to show calendar
+$sav = $tmpday;
+$showheader = true;
+foreach ($usernames as $username)
+{
+ echo "";
+ echo '| ' . $username->getNomUrl(1). ' | ';
+ $tmpday = $sav;
+
+ $i = 0;
+ for ($iter_day = 0; $iter_day < 7; $iter_day++)
+ {
+ if (($i + 1) < $begin_d || ($i + 1) > $end_d)
+ {
+ $i++;
+ continue;
+ }
+
+ // Show days of the current week
+ $curtime = dol_time_plus_duree($firstdaytoshow, $iter_day, 'd');
+ $tmparray = dol_getdate($curtime,'fast');
+ $tmpday = $tmparray['mday'];
+ $tmpmonth = $tmparray['mon'];
+ $tmpyear = $tmparray['year'];
+
+ $style='cal_current_month';
+ if ($iter_day == 6) $style.=' cal_other_month';
+ $today=0;
+ $todayarray=dol_getdate($now,'fast');
+ if ($todayarray['mday']==$tmpday && $todayarray['mon']==$month && $todayarray['year']==$year) $today=1;
+ if ($today) $style='cal_today_peruser';
+
+ show_day_events2($username, $tmpday, $month, $year, $monthshown, $style, $eventarray, 0, $maxnbofchar, $newparam, 1, 300, $showheader);
+
+ $i++;
+ }
+ echo " \n";
+ $showheader = false;
+}
+
+echo " \n";
+
+
+// Add js code to manage click on a box
+print '';
+
-
-';
-*/
llxFooter();
$db->close();
+
+
+
+
+
+/**
+ * Show event of a particular day
+ *
+ * @param int $day Day
+ * @param int $month Month
+ * @param int $year Year
+ * @param int $monthshown Current month shown in calendar view
+ * @param string $style Style to use for this day
+ * @param array &$eventarray Array of events
+ * @param int $maxprint Nb of actions to show each day on month view (0 means no limit)
+ * @param int $maxnbofchar Nb of characters to show for event line
+ * @param string $newparam Parameters on current URL
+ * @param int $showinfo Add extended information (used by day view)
+ * @param int $minheight Minimum height for each event. 60px by default.
+ * @return void
+ */
+function show_day_events2($username, $day, $month, $year, $monthshown, $style, &$eventarray, $maxprint=0, $maxnbofchar=16, $newparam='', $showinfo=0, $minheight=60, $showheader=false)
+{
+ global $db;
+ global $user, $conf, $langs;
+ global $filter, $filtera, $filtert, $filterd, $status, $actioncode; // Filters used into search form
+ global $theme_datacolor;
+ global $cachethirdparties, $cachecontacts, $colorindexused;
+ global $begin_h, $end_h;
+
+ $cases1 = array(); // Color first half hour
+ $cases2 = array(); // Color second half hour
+
+ $curtime = dol_mktime(0, 0, 0, $month, $day, $year);
+
+ $i=0; $nummytasks=0; $numother=0; $numbirthday=0; $numical=0; $numicals=array();
+ $ymd=sprintf("%04d",$year).sprintf("%02d",$month).sprintf("%02d",$day);
+
+ $nextindextouse=count($colorindexused); // At first run this is 0, so fist user has 0, next 1, ...
+
+ foreach ($eventarray as $daykey => $notused)
+ {
+ $annee = date('Y',$daykey);
+ $mois = date('m',$daykey);
+ $jour = date('d',$daykey);
+ if ($day==$jour && $month==$mois && $year==$annee)
+ {
+ //Tout les events à la même date :
+ foreach ($eventarray[$daykey] as $index => $event)
+ {
+ if ($username->id != $event->usertodo->id) continue; // We discard record if event is from another user than user we want to show
+
+ $ponct=($event->date_start_in_calendar == $event->date_end_in_calendar);
+
+ // Define $color and $cssclass of event
+ $color=-1; $cssclass=''; $colorindex=-1;
+ if ((! empty($event->author->id) && $event->author->id == $user->id)
+ || (! empty($event->usertodo->id) && $event->usertodo->id == $user->id)
+ || (! empty($event->userdone->id) && $event->userdone->id == $user->id))
+ {
+ $nummytasks++; $cssclass='family_mytasks';
+ }
+ else if ($event->type_code == 'ICALEVENT')
+ {
+ $numical++;
+ if (! empty($event->icalname)) {
+ if (! isset($numicals[dol_string_nospecial($event->icalname)])) {
+ $numicals[dol_string_nospecial($event->icalname)] = 0;
+ }
+ $numicals[dol_string_nospecial($event->icalname)]++;
+ }
+ $color=$event->icalcolor;
+ $cssclass=(! empty($event->icalname)?'family_'.dol_string_nospecial($event->icalname):'family_other unsortable');
+ }
+ else if ($event->type_code == 'BIRTHDAY') {
+ $numbirthday++; $colorindex=2; $cssclass='family_birthday unsortable'; $color=sprintf("%02x%02x%02x",$theme_datacolor[$colorindex][0],$theme_datacolor[$colorindex][1],$theme_datacolor[$colorindex][2]);
+ }
+ else { $numother++; $cssclass='family_other';
+ }
+ if ($color == -1) // Color was not forced. Set color according to color index.
+ {
+ // Define color index if not yet defined
+ $idusertouse=($event->usertodo->id?$event->usertodo->id:0);
+ if (isset($colorindexused[$idusertouse]))
+ {
+ $colorindex=$colorindexused[$idusertouse]; // Color already assigned to this user
+ }
+ else
+ {
+ $colorindex=$nextindextouse;
+ $colorindexused[$idusertouse]=$colorindex;
+ if (! empty($theme_datacolor[$nextindextouse+1])) $nextindextouse++; // Prepare to use next color
+ }
+ // Define color
+ $color=sprintf("%02x%02x%02x",$theme_datacolor[$colorindex][0],$theme_datacolor[$colorindex][1],$theme_datacolor[$colorindex][2]);
+ }
+ //$cssclass=$cssclass.' '.$cssclass.'_day_'.$ymd;
+
+ // Show rect of event
+ for ($h = $begin_h; $h < $end_h; $h++)
+ {
+ $color = ''; //init
+ if (empty($event->fulldayevent))
+ {
+ $a = dol_mktime((int) $h,0,0,$month,$day,$year);
+ $b = dol_mktime((int) $h,30,0,$month,$day,$year);
+ $c = dol_mktime((int) $h+1,0,0,$month,$day,$year);
+
+ if ($event->date_start_in_calendar < $b && $event->date_end_in_calendar > $a)
+ {
+ $cases1[$h][$event->id]++;
+ }
+ if ($event->date_start_in_calendar < $c && $event->date_end_in_calendar > $b)
+ {
+ $cases2[$h][$event->id]++;
+ }
+ }
+ else
+ {
+ $cases1[$h][$event->id]=1;
+ $cases2[$h][$event->id]=1;
+ break;
+ }
+ }
+ $i++;
+ }
+
+ break;
+ }
+ }
+
+ for ($h = $begin_h; $h < $end_h; $h++)
+ {
+ $style1='';$style2='';
+ $string1=' ';$string2=' ';
+ $title1='';$title2='';
+ if (isset($cases1[$h]))
+ {
+ if ($cases1[$h] != '')
+ {
+ $title = (int) $cases1[$h];
+ $title .= 'h';
+ if ((int) $cases1[$h] != $cases1[$h])
+ $title .= '30';
+ else
+ $title .= '00';
+ $string1=' ';
+ $style1='peruser_busy';
+ $url='';
+ }
+ }
+ if (isset($cases2[$h]))
+ {
+ if ($cases2[$h] != '')
+ {
+ $title = (int) $cases2[$h];
+ $title .= 'h';
+ if ((int) $cases2[$h] != $cases2[$h]) $title .= '30';
+ else $title .= '00';
+ $string2=' ';
+ $style2='peruser_busy';
+ $url='';
+ }
+ }
+
+
+ if ($h == $begin_h) echo ' | ';
+ else echo ' | ';
+ if (count($cases1[$h]) == 1) // 1 seul evenement
+ {
+ $ids=array_keys($cases1[$h]);
+ $id=$ids[0];
+ $title1='zzz';
+ }
+ if (count($cases2[$h]) == 1) // 1 seul evenement
+ {
+ $ids=array_keys($cases2[$h]);
+ $id=$ids[0];
+ $title2='bbb';
+ }
+ print '';
+ print '| ';
+ //var_dump($cases1[$h]);
+ print $string1;
+ print ' | ';
+ print $string2;
+ print ' | ';
+ print ' ';
+ print ' | ';
+ }
+}
diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index 35ab381a35f..2cfa97549b1 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -365,7 +365,11 @@ else if ($action == 'add' && $user->rights->propal->creer) {
if ($result > 0)
{
$lines = $srcobject->lines;
- if (empty($lines) && method_exists($srcobject, 'fetch_lines')) $lines = $srcobject->fetch_lines();
+ if (empty($lines) && method_exists($srcobject, 'fetch_lines'))
+ {
+ $srcobject->fetch_lines();
+ $lines = $srcobject->lines;
+ }
$fk_parent_line=0;
$num=count($lines);
@@ -1283,7 +1287,9 @@ if ($action == 'create') {
$objectsrc = new $classname($db);
$objectsrc->fetch($originid);
if (empty($objectsrc->lines) && method_exists($objectsrc, 'fetch_lines'))
+ {
$objectsrc->fetch_lines();
+ }
$objectsrc->fetch_thirdparty();
$projectid = (! empty($objectsrc->fk_project) ? $objectsrc->fk_project : '');
@@ -1951,7 +1957,8 @@ if ($action == 'create') {
print '
';
}
- if ($soc->outstanding_limit) {
+ if ($soc->outstanding_limit)
+ {
// Outstanding Bill
print '
+// Table :
+echo '