Skip to content

Commit

Permalink
Re Implement Zeiterfassung add New Functions
Browse files Browse the repository at this point in the history
  • Loading branch information
Sanzzes committed Jul 27, 2011
1 parent 9c50925 commit 136a75a
Show file tree
Hide file tree
Showing 15 changed files with 333 additions and 33 deletions.
11 changes: 11 additions & 0 deletions index.php
Expand Up @@ -4,7 +4,18 @@

//Set Time to Local German Time much formats 4 various servers
setlocale(LC_ALL,"de_DE", "de_DE.UTF-8", "de_DE@euro", "de", "ge");
//Mobile Geräte abfangen
if(eregi("Android", $_SERVER["HTTP_USER_AGENT"])){
header("Location: mobile/");
}
if(eregi("iPhone", $_SERVER["HTTP_USER_AGENT"])){
header("Location: mobile/");
}


if(!file_exists('src/config.inc.php')){
header("Location: install/index.php");
}
//Check if config File Exist if not go to Setup Page
if(!file_exists('src/config.inc.php')){
header("Location: install/index.php");
Expand Down
1 change: 0 additions & 1 deletion login.html
Expand Up @@ -6,7 +6,6 @@
<script type="text/javascript" language="JavaScript" src="./src/js/jquery/jquery.js"></script>
<script type="text/javascript" language="JavaScript" src="./src/js/jquery/jquery.tools.min.js"></script>
<script type="text/javascript" language="JavaScript" src="./src/js/login.js"></script>

</head>
<body>

Expand Down
6 changes: 6 additions & 0 deletions mobile/index.php
@@ -0,0 +1,6 @@
<?php

echo "Mobile Seite befindet sich im aufbau!!!!!";
echo $_SERVER["HTTP_USER_AGENT"];

?>
7 changes: 4 additions & 3 deletions src/css/style.css
Expand Up @@ -3,7 +3,6 @@
* Copyright (c) 2011
*/

@CHARSET "ISO-8859-1";
#form_1_zeit {
position:absolute;
padding:0px 0 0px 15%;
Expand Down Expand Up @@ -82,6 +81,7 @@ img{
border-bottom-left-radius: 10px;
-moz-border-radius-topleft: 10px;
border-top-left-radius: 10px;

}
#menu_ende{
-moz-border-radius-bottomright: 10px;
Expand Down Expand Up @@ -120,10 +120,10 @@ a {
}

#wrapper {
text-align: left;
width: 80%;
height: 600px;
margin: 0 auto;
text-align: left;
}

.head {
Expand Down Expand Up @@ -165,7 +165,8 @@ a {
}

.head a{
margin-left: 1%
margin-left: 1%;

}


Expand Down
6 changes: 6 additions & 0 deletions src/include/teatigkeiten.php
Expand Up @@ -62,6 +62,12 @@
$data_numrows--;

}
$mysql->query("SELECT * FROM synetics_process");
$process_result = $mysql->queryResult();
while($process=mysql_fetch_array($process_result,MYSQL_ASSOC))
{
$myprocess[$process['synetics_process_id']] = $process['synetics_process_name'];
}


if($_SESSION["user_rights"] > "1"){
Expand Down
166 changes: 166 additions & 0 deletions src/include/zeiterfassung.php
@@ -0,0 +1,166 @@
<SCRIPT>$(function() {
$( "#datepicker1" ).datepicker({ dateFormat: 'mm' });
$( "#datepicker2" ).datepicker({ dateFormat: 'yy' });
});</SCRIPT>
<?php
$todaysDate = time();
$todayMonth = date("m", $todaysDate);
$todayYear = date("Y", $todaysDate);

if(isset($_POST['worker_f']) && isset($_POST['datepicker1']) && isset($_POST['datepicker2']))
{
$workerID = $_POST['worker_f'];
$month = $_POST['datepicker1'];
$year = $_POST['datepicker2'];
$datum_start = $year . $month . "01";
$datum_ende = $year . $month . "31";
$smarty->assign('month', $month);
$smarty->assign('year', $year);
}
else
{
$workerID = $_SESSION['user_id'];
$month = $todayMonth;
$year = $todayYear;
$datum_start = $year . $month . "01";
$datum_ende = $year . $month . "31";
$smarty->assign('month', $todayMonth);
$smarty->assign('year', $todayYear);
}
$process = $_POST['process_id'];
if($_SESSION["user_rights"] > "1"){
$smarty->assign('boolsche','true');
}else{
$smarty->assign('boolsche','false');
}
//error_reporting(E_STRICT);
$smarty->assign('perID', $workerID);
$smarty->assign('procID', $process);
$mytime = new timestamp();
if($process != 0){
$mysql->query("SELECT * FROM synetics_data
INNER JOIN synetics_clients
ON (synetics_clients.synetics_clients_clientno = synetics_data.synetics_data_client)
WHERE synetics_data.synetics_data_system_id = '$workerID' AND synetics_data.synetics_data_date < '$datum_ende' AND synetics_data.synetics_data_date > '$datum_start' AND synetics_data_process_id = '$process' ORDER BY synetics_data.synetics_data_date");

}else{
$mysql->query("SELECT * FROM synetics_data
INNER JOIN synetics_clients
ON (synetics_clients.synetics_clients_clientno = synetics_data.synetics_data_client)
WHERE synetics_data.synetics_data_system_id = '$workerID' AND synetics_data.synetics_data_date < '$datum_ende' AND synetics_data.synetics_data_date > '$datum_start' ORDER BY synetics_data.synetics_data_date");

}
$data_result = $mysql->queryResult();
$mysql->query("SELECT * FROM synetics_system WHERE NOT synetics_system__ID = 1 ORDER BY synetics_system_name");
$personal_result = $mysql->queryResult();

$mysql->query("SELECT * FROM synetics_process");
$process_result = $mysql->queryResult();

$mysql->query("SELECT * FROM synetics_settings");
$settings = $mysql->fetchArray();

$dayWorkTime = $settings['synetics_settings_dayworktime'];

$i = 0;
while ($personal=mysql_fetch_array($personal_result, MYSQL_ASSOC))
{
foreach($personal as $key => $value){
$mypersonal[$i][$key] = utf8_encode($value);
}
$i++;
}

$i = 0;
$myprocess = array();
while ($process=mysql_fetch_array($process_result, MYSQL_ASSOC))
{
$myprocess[$i]['processname'] = $process['synetics_process_name'];
$myprocess[$i]['processid'] = $process['synetics_process_id'];
$i++;
}

$mydata = array();
$i = 0;
while($data=mysql_fetch_array($data_result, MYSQL_ASSOC))
{
$mysql->query("SELECT * FROM synetics_settings");
$settings = $mysql->fetchArray();
$mysql->query("SELECT * FROM synetics_projects WHERE synetics_projects__ID = '".$data['synetics_data_projects_id']."'");
$projects = $mysql->fetchArray();


if($projects == 0){
$projects['synetics_projects_projectname'] = '/';
}

$datum = $mytime->timestamp_mysql2german($data['synetics_data_date']);
$time_hin = $mytime->timestamp_time2ger($data['synetics_data_outjourneyex']);
$time_hin2 = $mytime->timestamp_time2ger($data['synetics_data_outjourneyto']);
$time_work = $mytime->timestamp_time2ger($data['synetics_data_worktimefrom']);
$time_work2 = $mytime->timestamp_time2ger($data['synetics_data_worktimeto']);
$time_zur = $mytime->timestamp_time2ger($data['synetics_data_returnjourneyex']);
$time_zur2 = $mytime->timestamp_time2ger($data['synetics_data_returnjourneyto']);

if($data['synetics_data_outjourneyex'] > $data['synetics_data_outjourneyto'])
{

$twenty = $mytime->secondsR('24:00') - $data['synetics_data_outjourneyex'];
$two = $data['synetics_data_outjourneyto'] - $mytime->secondsR('0:00');
$hinfahrtzeit = $twenty + $two;
}
else{
$hinfahrtzeit = $data['synetics_data_outjourneyto'] - $data['synetics_data_outjourneyex'];
}

if($data['synetics_data_returnjourneyex'] > $data['synetics_data_returnjourneyto'])
{

$twenty = $mytime->secondsR('24:00') - $data['synetics_data_returnjourneyex'];
$two = $data['synetics_data_returnjourneyto'] - $mytime->secondsR('0:00');
$zurückfahrzeit = $twenty + $two;
}
else{
$zurückfahrzeit = $data['synetics_data_returnjourneyto'] - $data['synetics_data_returnjourneyex'];
}

if($data['synetics_data_worktimefrom'] > $data['synetics_data_worktimeto'])
{

$twenty = $mytime->secondsR('24:00') - $data['synetics_data_worktimefrom'];
$two = $data['synetics_data_worktimeto'] - $mytime->secondsR('0:00');
$arbeitszeit = $twenty + $two;
}
else{
$arbeitszeit = $data['synetics_data_worktimeto'] - $data['synetics_data_worktimefrom'];
}

$fahrtzeit = $hinfahrtzeit + $zurückfahrzeit;
$pause = $data['synetics_data_wtpause'] - $data['synetics_data_pause'];
$azpause = $arbeitszeit - ($pause);
$allhour = $fahrtzeit + $arbeitszeit;
$ustunden = $azpause - $dayWorkTime;

$mydata[$i]['date'] = $datum['date'];
$mydata[$i]['synetics_projects_projectname'] = utf8_encode($projects['synetics_projects_projectname']);
$mydata[$i]['time_hin'] = $time_hin['time'];
$mydata[$i]['time_hin2'] = $time_hin2['time'];
$mydata[$i]['time_work'] = $time_work['time'];
$mydata[$i]['time_work2'] = $time_work2['time'];
$mydata[$i]['time_zur'] = $time_zur['time'];
$mydata[$i]['time_zur2'] = $time_zur2['time'];
$mydata[$i]['fahrtzeit'] = $fahrtzeit;
$mydata[$i]['pause'] = $mytime->timersSTD($pause);
$mydata[$i]['azpause'] = $mytime->timersSTD($azpause);
$mydata[$i]['allhour'] = $mytime->timersSTD($allhour);
$mydata[$i]['synetics_data_city'] = utf8_encode($data['synetics_data_city']);
$mydata[$i]['synetics_clients_client'] = utf8_encode($data['synetics_clients_client']);
$mydata[$i]['ustunden_synetics'] = $mytime->timersSTD($ustunden);
$i++;
}
$smarty->assign('data_lastname', $mypersonal);
$smarty->assign('data_main', $mydata);
$smarty->assign('data_process', $myprocess);
$smarty->display('zeiterfassung.tpl');
$smarty->assign('perID', $workerID);
?>
1 change: 1 addition & 0 deletions src/js/form.js
Expand Up @@ -225,6 +225,7 @@
success: function(json){
$("#datepicker").val(json.synetics_data_date);
$("#worker").val(json.synetics_data_system_id);
$("#process").val(json.synetics_data_process_id);
$("#client").val(json.synetics_data_client);
$("#workplace").val(json.synetics_data_city);
$("#hinfahrt_1").val(json.synetics_data_outjourneyex);
Expand Down
2 changes: 1 addition & 1 deletion src/js/main.js
Expand Up @@ -53,7 +53,7 @@ $(document).ready(function(){
$("#inhalte tr:not(tr:first)").hover(function(){
//Mouseover
$(this).data("oldbg", $(this).css("background-color"));
$(this).css("background-color", "#4050AB");
$(this).css("background-color", "#C6E2FF");
},function() {
//Mouseout
$(this).css("background-color", $(this).data("oldbg"));
Expand Down
3 changes: 3 additions & 0 deletions src/js/workflow.js
Expand Up @@ -11,6 +11,8 @@ $(function() {
rules: {
client:
{required: true, min: 1},
process:
{required: true, min: 1},
worker:
{required: true, min: 1},
workplace:
Expand Down Expand Up @@ -39,6 +41,7 @@ $(function() {
messages: {
client: "*Bitte Kunden auswählen!",
worker: "*Bitte Mitarbeiter wählen!",
process: "*Bitte Rechnungsstelle wählen!",
workplace: "*Bitte Einsatzort wählen!",
workplace2: "*Bitte Einsatzort eingeben!",
zeit_1: "*Fehlt!",
Expand Down
19 changes: 17 additions & 2 deletions src/tat.forms.php
Expand Up @@ -14,9 +14,9 @@
<td >
<p align="left">Stammdaten</p>
</legend>
<fieldset style="padding: 2; width:785px; height:103px">
<fieldset style="padding: 2; width:785px; height:160px">
<p align="left">
Mitarbeiter
Mitarbeiter:
<select size="1" name="worker" id="worker">
<option selected value="0">Bitte wählen</option>
<?php foreach ($myworkers AS $worker_id => $worker_name)
Expand All @@ -28,6 +28,21 @@
<?php
}

?>
</select>*</p>
<p align="left">
Rechnungsstelle:
<select size="1" name="process" id="process">
<option selected value="0">Bitte wählen</option>
<?php foreach ($myprocess AS $process_id => $process_name)
{
?>
<option value="<?php echo $process_id; ?>">
<?php echo $process_name?>
</option>
<?php
}

?>
</select>*</p>
<p align="left">
Expand Down
7 changes: 4 additions & 3 deletions src/tat_save.inc.php
Expand Up @@ -48,6 +48,7 @@
$art_3_1 = $_POST['art_3_1'];
$art_3_2 = $_POST['art_3_2'];
$kilometer = $_POST['kilometer'];
$process = $_POST['process'];

//Datum in einen MySQL String umwandeln
$datum_1 = $mytime->timestamp_german2mysql($datepicker);
Expand Down Expand Up @@ -115,15 +116,15 @@
synetics_data_wtpause,synetics_data_whichcar,synetics_data_text,
synetics_data_km,
synetics_data_returnjourneyex,synetics_data_returnjourneyto,synetics_data_system_id,
synetics_data_projects_id,synetics_data_foodoverall";
synetics_data_projects_id,synetics_data_foodoverall,synetics_data_process_id";

foreach($l_arr AS $l_key => $l_val){
$l_query .= ",".$l_key;
}
$l_query .= ") ";
$l_query .= "VALUES ('$datum_1','$client','$workplace','$hin_1','$hin_2',
'$z_1','$z_2','$p_1','$p_2','$wagen','$rechnungstext','$kilometer',
'$rb_1','$rb_2','$worker','$project' ,'$notthere'";
'$rb_1','$rb_2','$worker','$project' ,'$notthere','$process'";

foreach($l_arr AS $l_key => $l_val){
$l_query .= ",'$l_val'";
Expand All @@ -144,7 +145,7 @@
synetics_data_text='$rechnungstext',
synetics_data_km=$kilometer,
synetics_data_returnjourneyex=$rb_1,synetics_data_returnjourneyto=$rb_2,
synetics_data_projects_id=$project, synetics_data_foodoverall=$notthere";
synetics_data_projects_id=$project, synetics_data_foodoverall=$notthere, synetics_data_process_id=$process";

foreach($l_arr AS $l_key => $l_val){
$l_query_edit .= ",".$l_key."=".$l_val;
Expand Down
3 changes: 2 additions & 1 deletion src/templates/index.tpl
Expand Up @@ -14,11 +14,12 @@
<a href="javascript:window.location='?pageID=3'" id="m3"><img src="images/menu/menu-05.png"></a>
<a href="javascript:window.location='?pageID=4'" id="m4"><img src="images/menu/menu-06.png"></a>
<a href="javascript:window.location='?pageID=5'" id="m5"><img src="images/menu/menu-07.png"></a>
<a href="javascript:window.location='?pageID=6'" id="m5"><img src="images/menu/menu-08.png"></a>
<a href="javascript:window.location='?pageID=7'" id="m7"><img src="images/menu/menu-09.png"></a>
<img align="right" id="menu_ende" src="images/menu/menu-11.png">
</tr>
</table>
</div>
<div class="clearboth"></div>
</div>
</div>
<div class="maincontent">
2 changes: 0 additions & 2 deletions src/templates/workflow.tpl
Expand Up @@ -54,7 +54,6 @@ style="border-collapse: collapse">
<td ><font size="1">AZ - Pause</td>
<td ><font size="1">Fahrzt.</td>
<td ><font size="1">Gesamt-Zeit</td>
<td ><font size="1">Mehr Std.</td>
<td id="noprint"><font size="1">Funktion</td>
</tr>
{foreach key=key_wert_main item=item_wert_main from=$data_main}
Expand All @@ -74,7 +73,6 @@ style="border-collapse: collapse">
<td ><font size="1">{$item_wert_main.azpause}</td>
<td ><font size="1">{$item_wert_main.fahrtzeit}</td>
<td ><font size="1">{$item_wert_main.allhour}</td>
<td ><font size="1">{$item_wert_main.ustunden_synetics}</td>
<td id="noprint">
<a href="javascript:edit_workflow({$item_wert_main.synetics_data_ID})"
title="Person ändern u. Anzeigen">
Expand Down

0 comments on commit 136a75a

Please sign in to comment.