diff --git a/appinfo/app.php b/appinfo/app.php index f30a893..7261cd4 100644 --- a/appinfo/app.php +++ b/appinfo/app.php @@ -1,2 +1,5 @@ - + diff --git a/appinfo/routes.php b/appinfo/routes.php index 2bfcad8..11a36b8 100644 --- a/appinfo/routes.php +++ b/appinfo/routes.php @@ -9,6 +9,9 @@ return [ ], 'routes' => [ ['name' => 'page#index', 'url' => '/', 'verb' => 'GET'], + # TIME MANAGEMENT + ['name' => 'page#startWorkDay', 'url' => '/startday', 'verb' => 'GET'], + ['name' => 'page#loadTime', 'url' => '/loadtime', 'verb' => 'GET'], # AGENCY ['name' => 'agency#show', 'url' => '/getagencydata', 'verb' => 'GET'], ['name' => 'agency#updateagencydata', 'url' => '/updateagencydata', 'verb' => 'PUT'], diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php index e58c569..963187f 100644 --- a/lib/AppInfo/Application.php +++ b/lib/AppInfo/Application.php @@ -35,8 +35,6 @@ class Application extends App { # Event before a File is deletet $dispatcher->addServiceListener(BeforeNodeDeletedEvent::class, DeleteNCFileDjango::class); - - #Util::addScript($this->appName, 'da_agency-timemanagement'); } } diff --git a/lib/Controller/AgencyController.php b/lib/Controller/AgencyController.php index 6733b2b..59c89b3 100644 --- a/lib/Controller/AgencyController.php +++ b/lib/Controller/AgencyController.php @@ -149,7 +149,7 @@ class AgencyController extends Controller { * @CORS */ public function getlogdata(){ - refickdichscheissnextclouidturn "NIX!"; + } diff --git a/lib/Controller/PageController.php b/lib/Controller/PageController.php index acf8984..24cf191 100644 --- a/lib/Controller/PageController.php +++ b/lib/Controller/PageController.php @@ -5,19 +5,25 @@ namespace OCA\Agency\Controller; use OCP\IRequest; use OCP\AppFramework\Http\TemplateResponse; +use OCP\AppFramework\Http\RedirectResponse; +use OCP\AppFramework\Http\DataResponse; use OCP\AppFramework\Controller; use OCP\Util; +use OCP\IUserSession; use OCA\Agency\Service\AgencyService; class PageController extends Controller { protected $appName; + protected $userSession; private $service; + private $nclink = 'http://host.docker.internal:8000'; - public function __construct($appName, IRequest $request, AgencyService $service) { + public function __construct($appName, IRequest $request, AgencyService $service, IUserSession $userSession) { parent::__construct($appName, $request); $this->appName = $appName; + $this->userSession = $userSession; $this->service = $service; } @@ -34,4 +40,55 @@ class PageController extends Controller { $response = new TemplateResponse('da_agency', 'main'); return $response; } + + /** + * @NoCSRFRequired + * + * Gibt das Zeiterfassungsfenster als blankes Template zurück + */ + public function startWorkDay() { + $opts = [ + "http" => array( + "method" => "GET", + "header" => "" + ), + "ssl"=> array( + "verify_peer"=>false, + "verify_peer_name"=>false, + ), + ]; + $context = stream_context_create($opts); + + $file = file_get_contents($this->nclink.'/api/tm/startday/'.$this->userSession->getUser()->getUId().'/87zuhjk87GHJ546tzgvhas76aaskbdhr45edfVHAKia87s6gbAVGFGSR3451627gBHAKJBN', false, $context); + #$response = new TemplateResponse('da_agency', 'realtimeclock', ['userId' => $this->userSession->getUser()->getUID(), 'data' => "none"]); + if($file == "1"){ + return new DataResponse("OK"); + } + else { + return new DataResponse("FAIL"); + } + } + + /** + * @NoCSRFRequired + * + * Gibt das Zeiterfassungsfenster als blankes Template zurück + */ + public function loadTime() { + $opts = [ + "http" => array( + "method" => "GET", + "header" => "" + ), + "ssl"=> array( + "verify_peer"=>false, + "verify_peer_name"=>false, + ), + ]; + $context = stream_context_create($opts); + + $file = file_get_contents($this->nclink.'/api/tm/gettime/'.$this->userSession->getUser()->getUId().'/87zuhjk87GHJ546tzgvhas76aaskbdhr45edfVHAKia87s6gbAVGFGSR3451627gBHAKJBN', false, $context); + #$response = new TemplateResponse('da_agency', 'realtimeclock', ['userId' => $this->userSession->getUser()->getUID(), 'data' => "none"]); + return new DataResponse($file); + } } \ No newline at end of file diff --git a/lib/Controller/PublicController.php b/lib/Controller/PublicController.php index 045e8d4..779bffc 100644 --- a/lib/Controller/PublicController.php +++ b/lib/Controller/PublicController.php @@ -56,4 +56,6 @@ class PublicController extends OCSController { $this->groupManager->get($id)->setDisplayName($name); return new DataResponse(array("data" => $name." ".$id)); } + + } diff --git a/src/App.vue b/src/App.vue index 28a44c9..ae8c1e5 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,15 +1,18 @@ diff --git a/src/main.js b/src/main.js index 3fee987..7ebbf4e 100644 --- a/src/main.js +++ b/src/main.js @@ -1,22 +1,22 @@ import Vue from 'vue' import App from './App' -import VueRouter from 'vue-router' -import Routes from './router/routes' +// import VueRouter from 'vue-router' +// import Routes from './router/routes' import VueFormulate from '@braid/vue-formulate' import { de } from '@braid/vue-formulate-i18n' -Vue.use(VueRouter) +// Vue.use(VueRouter) Vue.use(VueFormulate, { plugins: [de], locale: 'de', }) Vue.prototype.$hostname = 'http://localhost:8080' -const router = new VueRouter({ - routes: Routes, -}) +// const router = new VueRouter({ +// routes: Routes, +// }) export default new Vue({ el: '#content', - router, + // router, render: h => h(App), }) diff --git a/src/timemanagement.js b/src/timemanagement.js deleted file mode 100644 index 97898b3..0000000 --- a/src/timemanagement.js +++ /dev/null @@ -1,4 +0,0 @@ -(function($) { - "use strict"; - console.log("HI!"); -}(jQuery)); diff --git a/templates/main.php b/templates/main.php index 4d82b99..f329eea 100644 --- a/templates/main.php +++ b/templates/main.php @@ -1,2 +1 @@ -
- +
\ No newline at end of file