mirror of
https://github.com/FH-Complete/FHC-Core.git
synced 2026-07-26 00:54:27 +00:00
Merge branch 'master' into signatur
This commit is contained in:
Andreas Österreicher
+61
-25
@@ -87,16 +87,62 @@ echo '<!DOCTYPE HTML>
|
||||
<link href="../../skin/style.css.php" rel="stylesheet" type="text/css">
|
||||
<title>'.$p->t('mailverteiler/oeffnenEinesVerteilers').'</title>
|
||||
</head>
|
||||
<style>
|
||||
body
|
||||
{
|
||||
width: 95%;
|
||||
margin: 10px;
|
||||
overflow: hidden;
|
||||
}
|
||||
.button_oeffnen
|
||||
{
|
||||
display: block;
|
||||
color: #fff;
|
||||
background-color: #337ab7;
|
||||
padding: 6px 12px;
|
||||
margin-bottom: 0;
|
||||
margin-top: 10px;
|
||||
text-align: center;
|
||||
white-space: nowrap;
|
||||
vertical-align: middle;
|
||||
cursor: pointer;
|
||||
background-image: none;
|
||||
border-radius: 4px;
|
||||
border: 1px solid transparent;
|
||||
overflow: visible;
|
||||
box-sizing: border-box;
|
||||
text-transform: none;
|
||||
}
|
||||
.button_oeffnen:hover
|
||||
{
|
||||
display: block;
|
||||
color: #fff;
|
||||
background-color: #286090;
|
||||
padding: 6px 12px;
|
||||
margin-bottom: 0;
|
||||
margin-top: 10px;
|
||||
text-align: center;
|
||||
white-space: nowrap;
|
||||
vertical-align: middle;
|
||||
cursor: pointer;
|
||||
background-image: none;
|
||||
border-radius: 4px;
|
||||
border: 1px solid transparent;
|
||||
overflow: visible;
|
||||
box-sizing: border-box;
|
||||
text-transform: none;
|
||||
}
|
||||
a, a:hover
|
||||
{
|
||||
text-decoration: none;
|
||||
}
|
||||
</style>
|
||||
<body>';
|
||||
|
||||
if (isset($_REQUEST['token']) && isset($_REQUEST['grp']))
|
||||
{
|
||||
echo '
|
||||
<table class="tabcontent">
|
||||
<tr>
|
||||
<td class="ContentHeader"><font class="ContentHeader">'.$p->t('mailverteiler/mailverteiler').'</font></td>
|
||||
<td class="ContentHeader"><font class="ContentHeader">'.$p->t('mailverteiler/status').'</font></td>
|
||||
</tr>';
|
||||
<h1>'.$p->t('mailverteiler/oeffnenEinesVerteilers').'</h1>';
|
||||
|
||||
/* Generate an random String */
|
||||
$mail_id = mail_id_generator();
|
||||
@@ -116,30 +162,18 @@ if (isset($_REQUEST['token']) && isset($_REQUEST['grp']))
|
||||
fwrite($filet, $message, mb_strlen($message));
|
||||
fclose($filet);
|
||||
|
||||
echo "
|
||||
<tr>
|
||||
<td><a href='mailto:".$_REQUEST['grp'].$mail_id."@".DOMAIN."'>".$db->convert_html_chars($_REQUEST['desc'])."</a></td>
|
||||
<td>".$p->t('mailverteiler/geoeffnet')." (Code: ".$mail_id.")</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan='2'>
|
||||
<p>".$p->t('mailverteiler/klickenZumSchicken')."</p>
|
||||
|
||||
<p>".$p->t('mailverteiler/infoBenutzung',array($_REQUEST['grp'].$mail_id."@".DOMAIN))."</p>
|
||||
</td>
|
||||
</tr>
|
||||
";
|
||||
echo '
|
||||
<p>'.$p->t('mailverteiler/geoeffnet',$db->convert_html_chars($_REQUEST['desc'])).'</p>
|
||||
<p><b>Code</b>: '.$mail_id.'<br>
|
||||
<b>Adresse</b>: <a href="mailto:?bcc='.$_REQUEST["grp"].$mail_id.'@'.DOMAIN.'">'.$_REQUEST["grp"].$mail_id.'@'.DOMAIN.'</a></p>
|
||||
<p>'.$p->t('mailverteiler/klickenZumSchicken').'</p>
|
||||
<p>'.$p->t('mailverteiler/infoBenutzung').'</p>';
|
||||
}
|
||||
else
|
||||
{
|
||||
echo '
|
||||
<tr>
|
||||
<td colspan="2">
|
||||
'.$p->t('mailverteiler/oeffnenFehlgeschlagen').'
|
||||
</td>
|
||||
</tr>';
|
||||
<p class="error">'.$p->t('mailverteiler/oeffnenFehlgeschlagen').'</p>';
|
||||
}
|
||||
echo '</table>';
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -149,7 +183,9 @@ else
|
||||
}
|
||||
else
|
||||
{
|
||||
echo $p->t('mailverteiler/bestaetigeOeffnen',array($_REQUEST['grp']))." : <a href=\"".$_SERVER['SCRIPT_NAME']."?grp=".$_REQUEST['grp']."&desc=".$db->convert_html_chars($_REQUEST['desc'])."&token=1\">".$p->t('mailverteiler/bestaetige')."</a>";
|
||||
echo '<h1>'.$p->t('mailverteiler/oeffnenEinesVerteilers').'</h1>';
|
||||
echo $p->t('mailverteiler/bestaetigeOeffnen').':';
|
||||
echo '<a href="'.$_SERVER['SCRIPT_NAME'].'?grp='.$_REQUEST['grp'].'&desc='.$db->convert_html_chars($_REQUEST['desc']).'&token=1"><button class="button_oeffnen">'.$p->t('mailverteiler/verteilerGenerieren',array($_REQUEST['grp'])).'</button></a>';
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -47,7 +47,7 @@ $p=new phrasen($sprache);
|
||||
if (!$db = new basis_db())
|
||||
die($p->t('global/fehlerBeimOeffnenDerDatenbankverbindung'));
|
||||
|
||||
$uid=get_uid();
|
||||
$uid = get_uid();
|
||||
|
||||
$datum_obj = new datum();
|
||||
|
||||
@@ -129,11 +129,11 @@ echo '<!DOCTYPE HTML>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
|
||||
<link href="../../../skin/style.css.php" rel="stylesheet" type="text/css">
|
||||
<link href="../../../skin/flexcrollstyles.css" rel="stylesheet" type="text/css" />
|
||||
<link rel="stylesheet" type="text/css" href="../../../skin/jquery-ui-1.9.2.custom.min.css">
|
||||
<script type="text/javascript" src="../../../vendor/jquery/jqueryV1/jquery-1.12.4.min.js"></script>
|
||||
<script type="text/javascript" src="../../../vendor/christianbach/tablesorter/jquery.tablesorter.min.js"></script>
|
||||
<script type="text/javascript" src="../../../vendor/components/jqueryui/jquery-ui.min.js"></script>
|
||||
<script type="text/javascript" src="../../../include/js/jquery.ui.datepicker.translation.js"></script>
|
||||
<link rel="stylesheet" type="text/css" href="../../../skin/jquery-ui-1.9.2.custom.min.css">
|
||||
<script type="text/javascript" src="../../../vendor/jquery/jqueryV1/jquery-1.12.4.min.js"></script>
|
||||
<script type="text/javascript" src="../../../vendor/christianbach/tablesorter/jquery.tablesorter.min.js"></script>
|
||||
<script type="text/javascript" src="../../../vendor/components/jqueryui/jquery-ui.min.js"></script>
|
||||
<script type="text/javascript" src="../../../include/js/jquery.ui.datepicker.translation.js"></script>
|
||||
<script type="text/javascript" src="../../../vendor/jquery/sizzle/sizzle.js"></script>
|
||||
<link rel="stylesheet" href="../../../skin/tablesort.css" type="text/css"/>
|
||||
<script language="JavaScript" type="text/javascript">
|
||||
@@ -323,7 +323,10 @@ if(!$ansicht && (!defined('CIS_PROFIL_FHAUSWEIS_ANZEIGEN') || CIS_PROFIL_FHAUSWE
|
||||
$bm = new betriebsmittel();
|
||||
if($bm->zutrittskarteAusgegeben($user->uid))
|
||||
{
|
||||
echo '<br>'.$p->t('profil/fhausweisWurdeBereitsAusgegeben');
|
||||
//wenn es mehr Zutrittskarten gab, wird das letzte Ausgabedatum erhalten
|
||||
$ausgegeben_am = $bm->result;
|
||||
$ausgegeben_am = $datum_obj->formatDatum($ausgegeben_am, 'd.m.Y');
|
||||
echo '<br>'.$p->t('profil/fhausweisWurdeBereitsAusgegeben', array($ausgegeben_am));
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
@@ -275,11 +275,7 @@ function getActualUserAmpelData($user_ampel_arr, $semester_start)
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
|
||||
<link rel="stylesheet" href="../../../skin/fhcomplete.css" type="text/css"/>
|
||||
<link rel="stylesheet" href="../../../skin/style.css.php" rel="stylesheet" type="text/css">
|
||||
<link rel="stylesheet" href="../../../skin/jquery.css" type="text/css"/>
|
||||
<link rel="stylesheet" type="text/css" href="../../../vendor/twbs/bootstrap/dist/css/bootstrap.min.css">
|
||||
<link rel="stylesheet" type="text/css" href="../../../skin/jquery-ui-1.9.2.custom.min.css">
|
||||
<script type="text/javascript" src="../../../vendor/components/jquery/jquery.min.js"></script>
|
||||
<script type="text/javascript" src="../../../vendor/twbs/bootstrap/dist/js/bootstrap.min.js"></script>
|
||||
<title><?php echo $p->t('tools/ampelsystem') ?></title>
|
||||
@@ -346,7 +342,7 @@ $(document).ready(function(){
|
||||
<?php
|
||||
//title in CIS
|
||||
if (!$is_popup)
|
||||
echo '<h2>' . $p->t('tools/ampelsystem') . '</h2>';
|
||||
echo '<h3>' . $p->t('tools/ampelsystem') . '</h3>';
|
||||
|
||||
//title in popup for mandatory ampeln
|
||||
if ($is_popup)
|
||||
@@ -402,10 +398,33 @@ $(document).ready(function(){
|
||||
|
||||
$cnt = 1; //counter to set iterative id's
|
||||
$cnt_inactive = 1; //counter to set only one heading line for inactive ampeln
|
||||
$cnt_active = 0;
|
||||
|
||||
//show panel "no actual ampeln" if there are no active ampeln
|
||||
foreach ($user_ampel_arr as $user_ampel)
|
||||
{
|
||||
if ($user_ampel['active'] == true)
|
||||
$cnt_active++;
|
||||
}
|
||||
|
||||
if ($cnt_active == 0)
|
||||
{
|
||||
echo '
|
||||
<div class="panel">
|
||||
<div class="row" style="margin-bottom: 15px; padding-left: 15px;">
|
||||
<div class="panel-heading" style="background-color: transparent" role="tab" id="heading">
|
||||
<h4>' . $p->t('tools/ampelKeineAktuellen'). '</h4>
|
||||
<small>' . $p->t('tools/ampelKeineAktuellenTxt'). '</small>
|
||||
</div>
|
||||
</div>
|
||||
</div>';
|
||||
|
||||
}
|
||||
|
||||
//fill panel with ampeln
|
||||
foreach ($user_ampel_arr as $user_ampel)
|
||||
{
|
||||
|
||||
//use only ampeln that are not overdue
|
||||
if ($user_ampel['show_ampel'] == true)
|
||||
{
|
||||
@@ -416,7 +435,7 @@ $(document).ready(function(){
|
||||
<div class="panel">
|
||||
<div class="row" style="margin-bottom: 15px; padding-left: 15px;">
|
||||
<div class="panel-heading" style="background-color: transparent" role="tab" id="heading">
|
||||
<h3>' . $p->t('tools/ampelAbgelaufenTitel'). '</h3>
|
||||
<h4>' . $p->t('tools/ampelAbgelaufenTitel'). '</h4>
|
||||
<small>' . $p->t('tools/ampelAbgelaufenTxt'). '</small>
|
||||
</div>
|
||||
</div>
|
||||
@@ -428,12 +447,12 @@ $(document).ready(function(){
|
||||
<div class="row" style="margin-bottom: 15px">
|
||||
<div class="panel-heading <?php if ($user_ampel['abgelaufen'] || $user_ampel['bestaetigt']) echo 'text-muted' ?>" style="background-color: transparent" role="tab" id="heading<?php echo $cnt ?>">
|
||||
<div class="col-xs-4">
|
||||
<h4 style="text-decoration: none" class="panel-title">
|
||||
<a class="collapsed" role="button" data-toggle="collapse" data-parent="#accordion"
|
||||
<h5 class="panel-title" style="text-decoration: none; font-size: 14px;">
|
||||
<a class="collapsed" style="text-decoration: none;" role="button" data-toggle="collapse" data-parent="#accordion"
|
||||
href="#collapse<?php echo $cnt ?>" aria-expanded="false" aria-controls="collapse<?php echo $cnt ?>">
|
||||
<?php echo $user_ampel['kurzbz'] ?>
|
||||
</a>
|
||||
</h4>
|
||||
</h5>
|
||||
<small <?php if ($user_ampel['status'] == 'rot' && !$user_ampel['abgelaufen']) echo 'style="color: red; font-weight : bold;"'?>><?php echo $p->t('global/faelligAm') . ' '; echo date('d.m.Y', strtotime($user_ampel['deadline'])) ?></small>
|
||||
</div>
|
||||
<div class="col-xs-2">
|
||||
@@ -465,7 +484,7 @@ $(document).ready(function(){
|
||||
</div>
|
||||
<div id="collapse<?php echo $cnt ?>" class="panel-collapse collapse" role="tabpanel" aria-labelledby="heading<?php echo $cnt ?>">
|
||||
<div class="panel-body" style="font-size: 12px;">
|
||||
<?php echo $user_ampel['beschreibung'][$sprache]?>
|
||||
<?php echo $user_ampel['beschreibung'][$sprache] ?>
|
||||
<p><br></p>
|
||||
<form method="POST" action="<?php echo htmlspecialchars($_SERVER['PHP_SELF']) . '?ampel_id='. urlencode($user_ampel['ampel_id']) . '&type=bestaetigen'; ?>">
|
||||
<button type="type" type="submit" class="btn btn-default pull-right"
|
||||
|
||||
+63
-17
@@ -196,17 +196,17 @@ function searchOE($searchItems)
|
||||
|
||||
//Suche nach Studiengaengen mit dem Suchbegriff und merge mit $searchItems
|
||||
$stg_oe_array = array();
|
||||
|
||||
$oe = new organisationseinheit();
|
||||
$oe->search($searchItems);
|
||||
|
||||
$stg = new studiengang();
|
||||
$stg->search($searchItems);
|
||||
foreach($stg->result as $row)
|
||||
{
|
||||
if($row->aktiv===true)
|
||||
$stg_oe_array[].= $row->oe_kurzbz;
|
||||
$oe->result[] = new organisationseinheit($row->oe_kurzbz);
|
||||
}
|
||||
$searchItems = array_merge_recursive($stg_oe_array,$searchItems);
|
||||
|
||||
$oe = new organisationseinheit();
|
||||
$oe->search($searchItems);
|
||||
|
||||
if(count($oe->result)>0)
|
||||
{
|
||||
@@ -413,6 +413,7 @@ function searchDms($searchItems)
|
||||
<th></th>
|
||||
<th>',$p->t('global/titel'),'</th>
|
||||
<th>',$p->t('tools/aktuelleVersion'),'</th>
|
||||
<th>',$p->t('tools/suchbegriffe'),'</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@@ -430,6 +431,7 @@ function searchDms($searchItems)
|
||||
else
|
||||
echo '<td width="20px" height="20px" style="vertical-align:middle;"><img src="../../../skin/images/blank.gif" style="height: 18px; vertical-align:middle;"></td><td height="20px" style="vertical-align:middle;"><a href="../../../cms/dms.php?id='.$row->dms_id.'">',$row->beschreibung,'</a></td>';
|
||||
echo '<td style="vertical-align:middle;">',$row->version,'</td>';
|
||||
echo '<td style="vertical-align:middle;">',$row->schlagworte,'</td>';
|
||||
echo '</tr>';
|
||||
echo "\n";
|
||||
}
|
||||
@@ -442,6 +444,7 @@ function searchDms($searchItems)
|
||||
else
|
||||
echo '<td width="20px" height="20px" style="vertical-align:middle;"><img src="../../../skin/images/blank.gif" style="height: 18px; vertical-align:middle;"></td><td height="20px" style="vertical-align:middle;"><a href="../../../cms/dms.php?id='.$row->dms_id.'">',$row->beschreibung,'</a></td>';
|
||||
echo '<td style="vertical-align:middle;">',$row->version,'</td>';
|
||||
echo '<td style="vertical-align:middle;">',$row->schlagworte,'</td>';
|
||||
echo '</tr>';
|
||||
echo "\n";
|
||||
}
|
||||
@@ -468,6 +471,7 @@ function searchContent($searchItems)
|
||||
}
|
||||
// Jede Sprache getrennt anzeigen aber zuerst die eingestellte Sprache
|
||||
$anzeigesprache='';
|
||||
// var_dump($cms->result);
|
||||
foreach($cms->result as $row)
|
||||
{
|
||||
if ($sprache == $row->sprache)
|
||||
@@ -487,12 +491,33 @@ function searchContent($searchItems)
|
||||
if (in_array($row->content_id, $content_id_arr))
|
||||
continue;
|
||||
|
||||
echo '<li><div class="suchergebnis">';
|
||||
echo '<a href="../../../cms/content.php?content_id=',$db->convert_html_chars($row->content_id),'&sprache=',$db->convert_html_chars($row->sprache),'">',$db->convert_html_chars($row->titel),'</a><br>';
|
||||
$preview = findAndMark($row->content, $searchItems);
|
||||
|
||||
echo $preview;
|
||||
echo '<br /><br /></div></li>';
|
||||
// Wenn der Eintrag vom Typ "redirect" ist, checken ob extern verlinkt wird oder nur ein Anker gesetzt ist (erstes Zeichen #)
|
||||
// Externe Links werden so ausgegeben, interne Anker gar nicht
|
||||
if ($row->template_kurzbz == 'redirect')
|
||||
{
|
||||
// URL aus content parsen
|
||||
$dom = new DOMDocument();
|
||||
$dom->loadXML($row->content);
|
||||
$content = $dom->getElementsByTagName('url')->item(0)->nodeValue;
|
||||
|
||||
if (substr($content, 0, 1) == '#')
|
||||
continue;
|
||||
else
|
||||
{
|
||||
echo '<li><div class="suchergebnis">';
|
||||
echo '<a href="'.$content.'" target="blank">',$db->convert_html_chars($row->titel),'</a><br>';
|
||||
echo '</div></li>';
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
echo '<li><div class="suchergebnis">';
|
||||
echo '<a href="../../../cms/content.php?content_id=',$db->convert_html_chars($row->content_id),'&sprache=',$db->convert_html_chars($row->sprache),'">',$db->convert_html_chars($row->titel),'</a><br>';
|
||||
$preview = findAndMark($row->content, $searchItems);
|
||||
|
||||
echo $preview;
|
||||
echo '</div></li>';
|
||||
}
|
||||
$content_id_arr[] .= $row->content_id;
|
||||
}
|
||||
}
|
||||
@@ -519,12 +544,33 @@ function searchContent($searchItems)
|
||||
if (in_array($row->content_id, $content_id_arr))
|
||||
continue;
|
||||
|
||||
echo '<li><div class="suchergebnis">';
|
||||
echo '<a href="../../../cms/content.php?content_id=',$db->convert_html_chars($row->content_id),'&sprache=',$db->convert_html_chars($row->sprache),'">',$db->convert_html_chars($row->titel),'</a><br>';
|
||||
$preview = findAndMark($row->content, $searchItems);
|
||||
|
||||
echo $preview;
|
||||
echo '<br /><br /></div></li>';
|
||||
// Wenn der Eintrag vom Typ "redirect" ist, checken ob extern verlinkt wird oder nur ein Anker gesetzt ist (erstes Zeichen #)
|
||||
// Externe Links werden so ausgegeben, interne Anker gar nicht
|
||||
if ($row->template_kurzbz == 'redirect')
|
||||
{
|
||||
// URL aus content parsen
|
||||
$dom = new DOMDocument();
|
||||
$dom->loadXML($row->content);
|
||||
$content = $dom->getElementsByTagName('url')->item(0)->nodeValue;
|
||||
|
||||
if (substr($content, 0, 1) == '#')
|
||||
continue;
|
||||
else
|
||||
{
|
||||
echo '<li><div class="suchergebnis">';
|
||||
echo '<a href="'.$content.'" target="blank">',$db->convert_html_chars($row->titel),'</a><br>';
|
||||
echo '</div></li>';
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
echo '<li><div class="suchergebnis">';
|
||||
echo '<a href="../../../cms/content.php?content_id=',$db->convert_html_chars($row->content_id),'&sprache=',$db->convert_html_chars($row->sprache),'">',$db->convert_html_chars($row->titel),'</a><br>';
|
||||
$preview = findAndMark($row->content, $searchItems);
|
||||
|
||||
echo $preview;
|
||||
echo '</div></li>';
|
||||
}
|
||||
$content_id_arr[] .= $row->content_id;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -91,12 +91,12 @@ $fieldheadings = array(
|
||||
if ($rechte->isBerechtigt('basis/servicezeitaufzeichnung'))
|
||||
{
|
||||
$za_simple = 0;
|
||||
$activities = array('Design', 'Operativ', 'Betrieb', 'Pause', 'LehreIntern', 'LehreExtern', 'Arztbesuch', 'Dienstreise', 'Behoerde');
|
||||
$activities = array('Design', 'Operativ', 'Betrieb', 'Pause', 'LehreIntern', 'LehreExtern', 'Arztbesuch', 'Dienstreise', 'Behoerde', 'Ersatzruhe');
|
||||
}
|
||||
else
|
||||
{
|
||||
$za_simple = 1;
|
||||
$activities = array('Arbeit', 'Pause', 'LehreIntern', 'LehreExtern', 'Arztbesuch', 'Dienstreise', 'Behoerde');
|
||||
$activities = array('Arbeit', 'Pause', 'LehreIntern', 'LehreExtern', 'Arztbesuch', 'Dienstreise', 'Behoerde', 'Ersatzruhe');
|
||||
}
|
||||
|
||||
$activities_str = "'".implode("','", $activities)."'";
|
||||
@@ -1096,6 +1096,8 @@ if($projekt->getProjekteMitarbeiter($user, true))
|
||||
$wochensumme='00:00';
|
||||
$extlehrearr=array();
|
||||
$elsumme = '00:00';
|
||||
$ersumme = '00:00';
|
||||
$ersumme_woche = '00:00';
|
||||
$datum_obj = new datum();
|
||||
$tagesbeginn = '';
|
||||
$tagesende = '';
|
||||
@@ -1168,13 +1170,18 @@ if($projekt->getProjekteMitarbeiter($user, true))
|
||||
else
|
||||
$langindex = 2;
|
||||
echo '<b>'.$tagbez[$langindex][$datum->formatDatum($tag,'N')].' '.$datum->formatDatum($tag,'d.m.Y').'</b> <span id="tag_'.$datum->formatDatum($tag,'d_m_Y').'">'.$zeitsperre_text.'</span>';
|
||||
|
||||
if ($ersumme != '00:00')
|
||||
$erstr = ' (+ '.$ersumme.' ER)';
|
||||
else
|
||||
{
|
||||
$erstr = '';
|
||||
}
|
||||
echo '</td>
|
||||
<td align="right" colspan="2" '.$style.'>
|
||||
<b>'.$p->t("zeitaufzeichnung/arbeitszeit").': '.$datum->formatDatum($tagesbeginn, $format='H:i').'-'.$datum->formatDatum($tagesende, $format='H:i').' '.$p->t("eventkalender/uhr").'</b><br>LehreExtern /
|
||||
'.$p->t("zeitaufzeichnung/pause").' '.($pflichtpause==false?$p->t("zeitaufzeichnung/inklusivePflichtpause"):'').':
|
||||
</td>
|
||||
<td '.$style.' align="right"><b>'.$tagessaldo.'</b><br>'.date('H:i', ($pausesumme-3600)).'</td>
|
||||
<td '.$style.' align="right"><b>'.$tagessaldo.$erstr.'</b><br>'.date('H:i', ($pausesumme-3600)).'</td>
|
||||
<td '.$style.' colspan="3" align="right">';
|
||||
if ($tag > $sperrdatum)
|
||||
echo '<a href="?von_datum='.$datum->formatDatum($tag,'d.m.Y').'&bis_datum='.$datum->formatDatum($tag,'d.m.Y').'" class="item"><-</a>';
|
||||
@@ -1185,6 +1192,7 @@ if($projekt->getProjekteMitarbeiter($user, true))
|
||||
$tagessumme='00:00';
|
||||
$pausesumme='00:00';
|
||||
$elsumme='00:00';
|
||||
$ersumme = '00:00';
|
||||
$extlehrearr = array();
|
||||
$tagesbeginn = '';
|
||||
$tagesende = '';
|
||||
@@ -1202,13 +1210,19 @@ if($projekt->getProjekteMitarbeiter($user, true))
|
||||
$woche = $datumwoche;
|
||||
if($woche!=$datumwoche)
|
||||
{
|
||||
if ($ersumme_woche != '00:00')
|
||||
$erstr = ' (+ '.$ersumme_woche.')';
|
||||
else
|
||||
{
|
||||
$erstr = '';
|
||||
}
|
||||
echo '
|
||||
|
||||
|
||||
<tr>
|
||||
<th colspan="'.$colspan.'" style="background-color: #8DBDD8;"></th>
|
||||
<th style="background-color: #8DBDD8;" align="right" colspan="2" style="font-weight: normal;"><b>'.$p->t("zeitaufzeichnung/wochensummeArbeitszeit").':</b></th>
|
||||
<th style="background-color: #8DBDD8;" align="right" style="font-weight: normal;"><b>'.$wochensaldo.'</b></th>
|
||||
<th style="background-color: #8DBDD8;" align="right" style="font-weight: normal;"><b>'.$wochensaldo.$erstr.'</b></th>
|
||||
<th style="background-color: #8DBDD8;" colspan="3"></th>
|
||||
</tr>
|
||||
|
||||
@@ -1230,6 +1244,8 @@ if($projekt->getProjekteMitarbeiter($user, true))
|
||||
$tagessumme='00:00';
|
||||
$pausesumme='00:00';
|
||||
$wochensaldo = '00:00';
|
||||
$ersumme = '00:00';
|
||||
$ersumme_woche = '00:00';
|
||||
}
|
||||
if ($row->uid)
|
||||
{
|
||||
@@ -1243,12 +1259,17 @@ if($projekt->getProjekteMitarbeiter($user, true))
|
||||
$pflichtpause = true;
|
||||
}
|
||||
}
|
||||
elseif ($row->aktivitaet_kurzbz=='Ersatzruhe')
|
||||
{
|
||||
$ersumme = $datum_obj->sumZeit($ersumme, $row->diff);
|
||||
$ersumme_woche = $datum_obj->sumZeit($ersumme_woche, $row->diff);
|
||||
}
|
||||
else
|
||||
$tagessumme = $datum_obj->sumZeit($tagessumme, $row->diff);
|
||||
$style = '';
|
||||
if ($row->zeitaufzeichnung_id == $zeitaufzeichnung_id)
|
||||
$style = 'style="border-top: 3px solid #8DBDD8; border-bottom: 3px solid #8DBDD8"';
|
||||
if ($row->aktivitaet_kurzbz=='Pause' || $row->aktivitaet_kurzbz=='LehreExtern')
|
||||
if ($row->aktivitaet_kurzbz=='Pause' || $row->aktivitaet_kurzbz=='LehreExtern'|| $row->aktivitaet_kurzbz=='Ersatzruhe')
|
||||
$style .= ' style="color: grey;"';
|
||||
$summe = $row->summe;
|
||||
$service = new service();
|
||||
@@ -1281,10 +1302,10 @@ if($projekt->getProjekteMitarbeiter($user, true))
|
||||
echo "</td>\n";
|
||||
echo " </tr>\n";
|
||||
|
||||
if (($tagesbeginn=='' || $datum->mktime_fromtimestamp($datum->formatDatum($tagesbeginn, $format='Y-m-d H:i:s')) > $datum->mktime_fromtimestamp($datum->formatDatum($row->start, $format='Y-m-d H:i:s'))) && $row->aktivitaet_kurzbz != 'LehreExtern')
|
||||
if (($tagesbeginn=='' || $datum->mktime_fromtimestamp($datum->formatDatum($tagesbeginn, $format='Y-m-d H:i:s')) > $datum->mktime_fromtimestamp($datum->formatDatum($row->start, $format='Y-m-d H:i:s'))) && $row->aktivitaet_kurzbz != 'LehreExtern' && $row->aktivitaet_kurzbz != 'Ersatzruhe')
|
||||
$tagesbeginn = $row->start;
|
||||
|
||||
if (($tagesende=='' || $datum->mktime_fromtimestamp($datum->formatDatum($tagesende, $format='Y-m-d H:i:s')) < $datum->mktime_fromtimestamp($datum->formatDatum($row->ende, $format='Y-m-d H:i:s'))) && $row->aktivitaet_kurzbz != 'LehreExtern')
|
||||
if (($tagesende=='' || $datum->mktime_fromtimestamp($datum->formatDatum($tagesende, $format='Y-m-d H:i:s')) < $datum->mktime_fromtimestamp($datum->formatDatum($row->ende, $format='Y-m-d H:i:s'))) && $row->aktivitaet_kurzbz != 'LehreExtern' && $row->aktivitaet_kurzbz != 'Ersatzruhe')
|
||||
$tagesende = $row->ende;
|
||||
if ($row->aktivitaet_kurzbz == 'LehreExtern')
|
||||
$extlehrearr[] = array("start"=>$row->start, "ende"=>$row->ende, "diff"=>$row->diff);
|
||||
|
||||
Reference in New Issue
Block a user