DigitaleAgentur___ALT
/
da_agency
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

dd

This commit is contained in:
Holger Trampe 2021-09-16 16:27:55 +02:00
parent 99472ddaff
commit f9d83c53b0
3 changed files with 36 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
js/tm.js
View File

@ -7,7 +7,7 @@ var breaktime = 0;
function loadTMIcon(){ function loadTMIcon(){
var iconBaseUrl = OC.generateUrl('/svg/core/actions/user-admin'); var iconBaseUrl = OC.generateUrl('/svg/core/actions/user-admin');
icon = $('<a href="#" class="header-menu" style="margin-right: 20px; margin-top: 2px;"><img src="'+iconBaseUrl+'"></a>'); icon = $('<a id="timeicon" href="#" class="header-menu" style="margin-right: 20px; margin-top: 2px; display: none;"><img src="'+iconBaseUrl+'"></a>');
$('.header-right').prepend(icon); $('.header-right').prepend(icon);
} }
@ -61,11 +61,19 @@ function addTMDiv(){
}).success(function (response) { }).success(function (response) {
$("#td_content").show(); $("#td_content").show();
$("#loader").hide(); $("#loader").hide();
responsedata = JSON.parse(response); responsedata = JSON.parse(response);
console.log(responsedata['usetime']);
$("#actualTime").html(responsedata['actualtime']); $("#actualTime").html(responsedata['actualtime']);
// No workday found // No workday found
if(responsedata['workdaydata_workday'] == 0 || response == false){ // User does not use time
if(responsedata['usetime'] == false ){
$("#timeicon").hide();
}
else{
$("#timeicon").show();
}
if(responsedata['workdaydata_workday'] == 0){
starttime_view = false; starttime_view = false;
startbreaktime_view = false; startbreaktime_view = false;
isbreak = false; isbreak = false;

27
lib/Controller/PageController.php
View File

@ -41,8 +41,22 @@ class PageController extends Controller {
return $response; return $response;
} }
function myUrlEncode($string) {
$entities = array('%21', '%2A', '%27', '%28', '%29', '%3B', '%3A', '%40', '%26', '%3D', '%2B', '%24', '%2C', '%2F', '%3F', '%25', '%23', '%5B', '%5D');
$replacements = array('!', '*', "'", "(", ")", ";", ":", "@", "&", "=", "+", "$", ",", "/", "?", "%", "#", "[", "]");
return str_replace($entities, $replacements, urlencode($string));
}
function removeMail(string $uid){
$uid = str_replace("@","REPLACEDATAELEMENTVER0000000001",$uid);
$uid = str_replace(".","POINTPOINTPOINTPOINTPOINTPOINT",$uid);
return $uid;
}
/** /**
* @NoCSRFRequired * @NoCSRFRequired
* @NoAdminRequired
* *
* Startet einen Arbeitstag * Startet einen Arbeitstag
*/ */
@ -59,13 +73,14 @@ class PageController extends Controller {
]; ];
$context = stream_context_create($opts); $context = stream_context_create($opts);
$file = file_get_contents($this->nclink.'/api/tm/startday/'.$this->userSession->getUser()->getUId().'/87zuhjk87GHJ546tzgvhas76aaskbdhr45edfVHAKia87s6gbAVGFGSR3451627gBHAKJBN', false, $context); $file = file_get_contents($this->myUrlEncode($this->nclink.'/api/tm/startday/'.$this->removeMail($this->userSession->getUser()->getUId()).'/87zuhjk87GHJ546tzgvhas76aaskbdhr45edfVHAKia87s6gbAVGFGSR3451627gBHAKJBN'), false, $context);
#$response = new TemplateResponse('da_agency', 'realtimeclock', ['userId' => $this->userSession->getUser()->getUID(), 'data' => "none"]); #$response = new TemplateResponse('da_agency', 'realtimeclock', ['userId' => $this->userSession->getUser()->getUID(), 'data' => "none"]);
return new DataResponse($file); return new DataResponse($file);
} }
/** /**
* @NoCSRFRequired * @NoCSRFRequired
* @NoAdminRequired
* *
* Beendet einen Arbeitstag * Beendet einen Arbeitstag
*/ */
@ -82,13 +97,14 @@ class PageController extends Controller {
]; ];
$context = stream_context_create($opts); $context = stream_context_create($opts);
$file = file_get_contents($this->nclink.'/api/tm/endday/'.$this->userSession->getUser()->getUId().'/87zuhjk87GHJ546tzgvhas76aaskbdhr45edfVHAKia87s6gbAVGFGSR3451627gBHAKJBN', false, $context); $file = file_get_contents($this->myUrlEncode($this->nclink.'/api/tm/endday/'.$this->removeMail($this->userSession->getUser()->getUId()).'/87zuhjk87GHJ546tzgvhas76aaskbdhr45edfVHAKia87s6gbAVGFGSR3451627gBHAKJBN'), false, $context);
#$response = new TemplateResponse('da_agency', 'realtimeclock', ['userId' => $this->userSession->getUser()->getUID(), 'data' => "none"]); #$response = new TemplateResponse('da_agency', 'realtimeclock', ['userId' => $this->userSession->getUser()->getUID(), 'data' => "none"]);
return new DataResponse($file); return new DataResponse($file);
} }
/** /**
* @NoCSRFRequired * @NoCSRFRequired
* @NoAdminRequired
* *
* Beendet einen Arbeitstag * Beendet einen Arbeitstag
*/ */
@ -105,13 +121,14 @@ class PageController extends Controller {
]; ];
$context = stream_context_create($opts); $context = stream_context_create($opts);
$file = file_get_contents($this->nclink.'/api/tm/startbreak/'.$this->userSession->getUser()->getUId().'/87zuhjk87GHJ546tzgvhas76aaskbdhr45edfVHAKia87s6gbAVGFGSR3451627gBHAKJBN', false, $context); $file = file_get_contents($this->myUrlEncode($this->nclink.'/api/tm/startbreak/'.$this->removeMail($this->userSession->getUser()->getUId()).'/87zuhjk87GHJ546tzgvhas76aaskbdhr45edfVHAKia87s6gbAVGFGSR3451627gBHAKJBN'), false, $context);
#$response = new TemplateResponse('da_agency', 'realtimeclock', ['userId' => $this->userSession->getUser()->getUID(), 'data' => "none"]); #$response = new TemplateResponse('da_agency', 'realtimeclock', ['userId' => $this->userSession->getUser()->getUID(), 'data' => "none"]);
return new DataResponse($file); return new DataResponse($file);
} }
/** /**
* @NoCSRFRequired * @NoCSRFRequired
* @NoAdminRequired
* *
* Beendet einen Arbeitstag * Beendet einen Arbeitstag
*/ */
@ -128,7 +145,7 @@ class PageController extends Controller {
]; ];
$context = stream_context_create($opts); $context = stream_context_create($opts);
$file = file_get_contents($this->nclink.'/api/tm/endbreak/'.$this->userSession->getUser()->getUId().'/87zuhjk87GHJ546tzgvhas76aaskbdhr45edfVHAKia87s6gbAVGFGSR3451627gBHAKJBN', false, $context); $file = file_get_contents($this->myUrlEncode($this->nclink.'/api/tm/endbreak/'.$this->removeMail($this->userSession->getUser()->getUId()).'/87zuhjk87GHJ546tzgvhas76aaskbdhr45edfVHAKia87s6gbAVGFGSR3451627gBHAKJBN'), false, $context);
#$response = new TemplateResponse('da_agency', 'realtimeclock', ['userId' => $this->userSession->getUser()->getUID(), 'data' => "none"]); #$response = new TemplateResponse('da_agency', 'realtimeclock', ['userId' => $this->userSession->getUser()->getUID(), 'data' => "none"]);
return new DataResponse($file); return new DataResponse($file);
} }
@ -153,7 +170,7 @@ class PageController extends Controller {
]; ];
$context = stream_context_create($opts); $context = stream_context_create($opts);
$file = file_get_contents($this->nclink.'/api/tm/gettime/'.$this->userSession->getUser()->getUId().'/87zuhjk87GHJ546tzgvhas76aaskbdhr45edfVHAKia87s6gbAVGFGSR3451627gBHAKJBN', false, $context); $file = file_get_contents($this->myUrlEncode($this->nclink.'/api/tm/gettime/'.$this->removeMail($this->userSession->getUser()->getUId()).'/87zuhjk87GHJ546tzgvhas76aaskbdhr45edfVHAKia87s6gbAVGFGSR3451627gBHAKJBN'), false, $context);
return new DataResponse($file); return new DataResponse($file);
} }
} }

2
lib/Controller/PublicController.php
View File

@ -35,6 +35,7 @@ class PublicController extends OCSController {
/** /**
* *
* @NoCSRFRequired * @NoCSRFRequired
* @NoAdminRequired
*/ */
public function createGroupFolder(string $gid, string $aid, bool $newagency=false): DataResponse{ public function createGroupFolder(string $gid, string $aid, bool $newagency=false): DataResponse{
if($newagency == false){ if($newagency == false){
@ -62,6 +63,7 @@ class PublicController extends OCSController {
/** /**
* *
* @NoCSRFRequired * @NoCSRFRequired
* @NoAdminRequired
*/ */
public function renameAgencyGroup(string $name, string $id): DataResponse{ public function renameAgencyGroup(string $name, string $id): DataResponse{
$this->groupManager->get($id)->setDisplayName($name); $this->groupManager->get($id)->setDisplayName($name);