Travaux sur une V2 pour la visualisation des culum de temps sur la feuille de temps (8c840eda) · Commits · open-source / oscar

module/Oscar/src/Oscar/Controller/TimesheetController.php

+15 −0

Changes for module/Oscar/src/Oscar/Controller/TimesheetController.php: 15 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -25,6 +25,7 @@ use Oscar\Formatter\TimesheetActivityPeriodHtmlFormatter;
		use Oscar\Formatter\TimesheetActivityPeriodPdfFormatter;
		use Oscar\Formatter\TimesheetPersonPeriodHtmlFormatter;
		use Oscar\Formatter\TimesheetPersonPeriodPdfFormatter;
		use Oscar\OscarVersion;
		use Oscar\Provider\Privileges;
		use Oscar\Service\PersonService;
		use Oscar\Service\ProjectGrantService;
		@@ -662,6 +663,7 @@ class TimesheetController extends AbstractOscarController
		$person_id = $this->params()->fromQuery('person_id', null);
		$format = $this->params()->fromQuery('format', '');
		$period = $this->params()->fromQuery('period', null);
		$version = $this->params()->fromQuery('v', 1);
		$error = null;
		$validations = null;

		@@ -804,6 +806,19 @@ class TimesheetController extends AbstractOscarController
		}

		if( $format == "json" \|\| $this->isAjax() ){
		if( $version == "2" ){
		$json = [
		'date' => date("Y-m-d H:i:s"),
		'version' => OscarVersion::getBuild(),
		'activity_id' => $activity->getId(),
		'acronym' => $activity->getAcronym(),
		'label' => $activity->getLabel(),
		'start' => $activity->getDateStartStr(),
		'end' => $activity->getDateEndStr(),
		'synthesis' => $datas
		];
		return $this->jsonOutput($json);
		}
		return $this->jsonOutput($datas);
		}

public/js/oscar/dist/ActivityTimesheetSynthesisMenu.umd.js

deleted100644 → 0

+0 −435

Changes for public/js/oscar/dist/ActivityTimesheetSynthesisMenu.umd.js: 0 added lines, 435 removed lines.
Original line number	Diff line number	Diff line
		(function webpackUniversalModuleDefinition(root, factory) {
		if(typeof exports === 'object' && typeof module === 'object')
		module.exports = factory();
		else if(typeof define === 'function' && define.amd)
		define([], factory);
		else if(typeof exports === 'object')
		exports["ActivityTimesheetSynthesisMenu"] = factory();
		else
		root["ActivityTimesheetSynthesisMenu"] = factory();
		})((typeof self !== 'undefined' ? self : this), function() {
		return /******/ (function(modules) { // webpackBootstrap
		/******/ // The module cache
		/******/ var installedModules = {};
		/******/
		/******/ // The require function
		/******/ function __webpack_require__(moduleId) {
		/******/
		/******/ // Check if module is in cache
		/******/ if(installedModules[moduleId]) {
		/******/ return installedModules[moduleId].exports;
		/******/ }
		/******/ // Create a new module (and put it into the cache)
		/******/ var module = installedModules[moduleId] = {
		/******/ i: moduleId,
		/******/ l: false,
		/******/ exports: {}
		/******/ };
		/******/
		/******/ // Execute the module function
		/******/ modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
		/******/
		/******/ // Flag the module as loaded
		/******/ module.l = true;
		/******/
		/******/ // Return the exports of the module
		/******/ return module.exports;
		/******/ }
		/******/
		/******/
		/******/ // expose the modules object (__webpack_modules__)
		/******/ __webpack_require__.m = modules;
		/******/
		/******/ // expose the module cache
		/******/ __webpack_require__.c = installedModules;
		/******/
		/******/ // define getter function for harmony exports
		/******/ __webpack_require__.d = function(exports, name, getter) {
		/******/ if(!__webpack_require__.o(exports, name)) {
		/******/ Object.defineProperty(exports, name, { enumerable: true, get: getter });
		/******/ }
		/******/ };
		/******/
		/******/ // define __esModule on exports
		/******/ __webpack_require__.r = function(exports) {
		/******/ if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
		/******/ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
		/******/ }
		/******/ Object.defineProperty(exports, '__esModule', { value: true });
		/******/ };
		/******/
		/******/ // create a fake namespace object
		/******/ // mode & 1: value is a module id, require it
		/******/ // mode & 2: merge all properties of value into the ns
		/******/ // mode & 4: return value when already ns object
		/******/ // mode & 8\|1: behave like require
		/******/ __webpack_require__.t = function(value, mode) {
		/******/ if(mode & 1) value = __webpack_require__(value);
		/******/ if(mode & 8) return value;
		/******/ if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
		/******/ var ns = Object.create(null);
		/******/ __webpack_require__.r(ns);
		/******/ Object.defineProperty(ns, 'default', { enumerable: true, value: value });
		/******/ if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
		/******/ return ns;
		/******/ };
		/******/
		/******/ // getDefaultExport function for compatibility with non-harmony modules
		/******/ __webpack_require__.n = function(module) {
		/******/ var getter = module && module.__esModule ?
		/******/ function getDefault() { return module['default']; } :
		/******/ function getModuleExports() { return module; };
		/******/ __webpack_require__.d(getter, 'a', getter);
		/******/ return getter;
		/******/ };
		/******/
		/******/ // Object.prototype.hasOwnProperty.call
		/******/ __webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };
		/******/
		/******/ // __webpack_public_path__
		/******/ __webpack_require__.p = "";
		/******/
		/******/
		/******/ // Load entry module and return exports
		/******/ return __webpack_require__(__webpack_require__.s = "fb15");
		/******/ })
		/************************************************************************/
		/******/ ({

		/***/ "8875":
		/***/ (function(module, exports, __webpack_require__) {

		var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;// addapted from the document.currentScript polyfill by Adam Miller
		// MIT license
		// source: https://github.com/amiller-gh/currentScript-polyfill

		// added support for Firefox https://bugzilla.mozilla.org/show_bug.cgi?id=1620505

		(function (root, factory) {
		if (true) {
		!(__WEBPACK_AMD_DEFINE_ARRAY__ = [], __WEBPACK_AMD_DEFINE_FACTORY__ = (factory),
		__WEBPACK_AMD_DEFINE_RESULT__ = (typeof __WEBPACK_AMD_DEFINE_FACTORY__ === 'function' ?
		(__WEBPACK_AMD_DEFINE_FACTORY__.apply(exports, __WEBPACK_AMD_DEFINE_ARRAY__)) : __WEBPACK_AMD_DEFINE_FACTORY__),
		__WEBPACK_AMD_DEFINE_RESULT__ !== undefined && (module.exports = __WEBPACK_AMD_DEFINE_RESULT__));
		} else {}
		}(typeof self !== 'undefined' ? self : this, function () {
		function getCurrentScript () {
		var descriptor = Object.getOwnPropertyDescriptor(document, 'currentScript')
		// for chrome
		if (!descriptor && 'currentScript' in document && document.currentScript) {
		return document.currentScript
		}

		// for other browsers with native support for currentScript
		if (descriptor && descriptor.get !== getCurrentScript && document.currentScript) {
		return document.currentScript
		}

		// IE 8-10 support script readyState
		// IE 11+ & Firefox support stack trace
		try {
		throw new Error();
		}
		catch (err) {
		// Find the second match for the "at" string to get file src url from stack.
		var ieStackRegExp = /.at [^(]$(.*):(.+):(.+)$$/ig,
		ffStackRegExp = /@([^@]):(\d+):(\d+)\s$/ig,
		stackDetails = ieStackRegExp.exec(err.stack) \|\| ffStackRegExp.exec(err.stack),
		scriptLocation = (stackDetails && stackDetails[1]) \|\| false,
		line = (stackDetails && stackDetails[2]) \|\| false,
		currentLocation = document.location.href.replace(document.location.hash, ''),
		pageSource,
		inlineScriptSourceRegExp,
		inlineScriptSource,
		scripts = document.getElementsByTagName('script'); // Live NodeList collection

		if (scriptLocation === currentLocation) {
		pageSource = document.documentElement.outerHTML;
		inlineScriptSourceRegExp = new RegExp('(?:[^\\n]+?\\n){0,' + (line - 2) + '}[^<]<script>([\\d\\D]?)<\\/script>[\\d\\D]*', 'i');
		inlineScriptSource = pageSource.replace(inlineScriptSourceRegExp, '$1').trim();
		}

		for (var i = 0; i < scripts.length; i++) {
		// If ready state is interactive, return the script tag
		if (scripts[i].readyState === 'interactive') {
		return scripts[i];
		}

		// If src matches, return the script tag
		if (scripts[i].src === scriptLocation) {
		return scripts[i];
		}

		// If inline source matches, return the script tag
		if (
		scriptLocation === currentLocation &&
		scripts[i].innerHTML &&
		scripts[i].innerHTML.trim() === inlineScriptSource
		) {
		return scripts[i];
		}
		}

		// If no match, return null
		return null;
		}
		};

		return getCurrentScript
		}));


		/***/ }),

		/***/ "fb15":
		/***/ (function(module, __webpack_exports__, __webpack_require__) {

		"use strict";
		// ESM COMPAT FLAG
		__webpack_require__.r(__webpack_exports__);

		// CONCATENATED MODULE: ./node_modules/@vue/cli-service/lib/commands/build/setPublicPath.js
		// This file is imported into lib/wc client bundles.

		if (typeof window !== 'undefined') {
		var currentScript = window.document.currentScript
		if (true) {
		var getCurrentScript = __webpack_require__("8875")
		currentScript = getCurrentScript()

		// for backward compatibility, because previously we directly included the polyfill
		if (!('currentScript' in document)) {
		Object.defineProperty(document, 'currentScript', { get: getCurrentScript })
		}
		}

		var src = currentScript && currentScript.src.match(/(.+\/)[^/]+\.js(\?.*)?$/)
		if (src) {
		__webpack_require__.p = src[1] // eslint-disable-line
		}
		}

		// Indicate to webpack that this file can be concatenated
		/* harmony default export */ var setPublicPath = (null);

		// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"a257e54e-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./src/ActivityTimesheetSynthesisMenu.vue?vue&type=template&id=be334a84&
		var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c\|\|_h;return _c('div',[(_vm.open)?_c('div',{staticClass:"overlay"},[_c('div',{staticClass:"overlay-content"},[_c('a',{staticClass:"overlay-closer",attrs:{"href":"#"},on:{"click":function($event){return _vm.handlerCloseSynthesis()}}},[_vm._v("Close")]),_vm._v(" OPTIONS ICI ")])]):_vm._e(),_c('pre',[_vm._v(_vm._s(_vm.url))]),_c('button',{staticClass:"btn btn-primary",on:{"click":function($event){return _vm.handlerOpenSynthesis()}}},[_c('i',{staticClass:"icon-calendar"}),_vm._v(" Synthèse des déclarations ")])])}
		var staticRenderFns = []


		// CONCATENATED MODULE: ./src/ActivityTimesheetSynthesisMenu.vue?vue&type=template&id=be334a84&

		// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./src/ActivityTimesheetSynthesisMenu.vue?vue&type=script&lang=js&
		//
		//
		//
		//
		//
		//
		//
		//
		//
		//
		//
		//
		//
		//
		//

		/******************************************************************************************************************/
		/* ! DEVELOPPEUR
		Depuis la racine OSCAR :

		cd front

		Pour compiler en temps réél :
		node node_modules/.bin/gulp activityTimesheetSynthesisMenuWatch

		Pour compiler :
		node node_modules/.bin/gulp activityTimesheetSynthesisMenu

		*/

		// import AjaxOscar from "./remote/AjaxOscar";
		// import OscarRemoteData from "./remote/OscarRemoteData";

		// test
		/* harmony default export */ var ActivityTimesheetSynthesisMenuvue_type_script_lang_js_ = ({

		// components: {
		// "ajax-oscar": AjaxOscar
		// },

		props: {
		url: { require: true }
		},

		data() {
		return {
		configuration: null,
		open: false,
		synthese: null
		}
		},

		methods: {
		handlerOpenSynthesis() {
		this.open = true;
		this.loadSynthesis();
		},
		handlerCloseSynthesis() {
		this.open = false;
		console.log("CLOSE Synthesis");
		},
		loadSynthesis(){
		this.loading = "Chargement de la synthèse...";
		this.$http.get(this.url).then(
		ok => {
		console.log(ok);
		}, ko => {

		}
		)
		}
		},

		mounted() {
		console.log("ActivityTimesheetSynthesisMenu.vue")
		}

		});

		// CONCATENATED MODULE: ./src/ActivityTimesheetSynthesisMenu.vue?vue&type=script&lang=js&
		/* harmony default export */ var src_ActivityTimesheetSynthesisMenuvue_type_script_lang_js_ = (ActivityTimesheetSynthesisMenuvue_type_script_lang_js_);
		// CONCATENATED MODULE: ./node_modules/vue-loader/lib/runtime/componentNormalizer.js
		/* globals __VUE_SSR_CONTEXT__ */

		// IMPORTANT: Do NOT use ES2015 features in this file (except for modules).
		// This module is a runtime utility for cleaner component module output and will
		// be included in the final webpack user bundle.

		function normalizeComponent (
		scriptExports,
		render,
		staticRenderFns,
		functionalTemplate,
		injectStyles,
		scopeId,
		moduleIdentifier, /* server only */
		shadowMode /* vue-cli only */
		) {
		// Vue.extend constructor export interop
		var options = typeof scriptExports === 'function'
		? scriptExports.options
		: scriptExports

		// render functions
		if (render) {
		options.render = render
		options.staticRenderFns = staticRenderFns
		options._compiled = true
		}

		// functional template
		if (functionalTemplate) {
		options.functional = true
		}

		// scopedId
		if (scopeId) {
		options._scopeId = 'data-v-' + scopeId
		}

		var hook
		if (moduleIdentifier) { // server build
		hook = function (context) {
		// 2.3 injection
		context =
		context \|\| // cached call
		(this.$vnode && this.$vnode.ssrContext) \|\| // stateful
		(this.parent && this.parent.$vnode && this.parent.$vnode.ssrContext) // functional
		// 2.2 with runInNewContext: true
		if (!context && typeof __VUE_SSR_CONTEXT__ !== 'undefined') {
		context = __VUE_SSR_CONTEXT__
		}
		// inject component styles
		if (injectStyles) {
		injectStyles.call(this, context)
		}
		// register component module identifier for async chunk inferrence
		if (context && context._registeredComponents) {
		context._registeredComponents.add(moduleIdentifier)
		}
		}
		// used by ssr in case component is cached and beforeCreate
		// never gets called
		options._ssrRegister = hook
		} else if (injectStyles) {
		hook = shadowMode
		? function () {
		injectStyles.call(
		this,
		(options.functional ? this.parent : this).$root.$options.shadowRoot
		)
		}
		: injectStyles
		}

		if (hook) {
		if (options.functional) {
		// for template-only hot-reload because in that case the render fn doesn't
		// go through the normalizer
		options._injectStyles = hook
		// register for functional component in vue file
		var originalRender = options.render
		options.render = function renderWithStyleInjection (h, context) {
		hook.call(context)
		return originalRender(h, context)
		}
		} else {
		// inject component registration as beforeCreate hook
		var existing = options.beforeCreate
		options.beforeCreate = existing
		? [].concat(existing, hook)
		: [hook]
		}
		}

		return {
		exports: scriptExports,
		options: options
		}
		}

		// CONCATENATED MODULE: ./src/ActivityTimesheetSynthesisMenu.vue





		/* normalize component */

		var component = normalizeComponent(
		src_ActivityTimesheetSynthesisMenuvue_type_script_lang_js_,
		render,
		staticRenderFns,
		false,
		null,
		null,
		null

		)

		/* harmony default export */ var ActivityTimesheetSynthesisMenu = (component.exports);
		// CONCATENATED MODULE: ./node_modules/@vue/cli-service/lib/commands/build/entry-lib.js


		/* harmony default export */ var entry_lib = __webpack_exports__["default"] = (ActivityTimesheetSynthesisMenu);



		/***/ })

		/******/ })["default"];
		});
		//# sourceMappingURL=ActivityTimesheetSynthesisMenu.umd.js.map
		No newline at end of file

public/js/oscar/dist/ActivityTimesheetSynthesisMenu.umd.js.map

deleted100644 → 0

+0 −1

File deleted.

Preview size limit exceeded, changes collapsed.

public/js/oscar/dist/ActivityTimesheetSynthesisMenu.umd.min.js

deleted100644 → 0

+0 −2

(function(e,t){"object"===typeof exports&&"object"===typeof module?module.exports=t():"function"===typeof define&&define.amd?define([],t):"object"===typeof exports?exports["ActivityTimesheetSynthesisMenu"]=t():e["ActivityTimesheetSynthesisMenu"]=t()})("undefined"!==typeof self?self:this,(function(){return function(e){var t={};function n(r){if(t[r])return t[r].exports;var o=t[r]={i:r,l:!1,exports:{}};return e[r].call(o.exports,o,o.exports,n),o.l=!0,o.exports}return n.m=e,n.c=t,n.d=function(e,t,r){n.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:r})},n.r=function(e){"undefined"!==typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},n.t=function(e,t){if(1&t&&(e=n(e)),8&t)return e;if(4&t&&"object"===typeof e&&e&&e.__esModule)return e;var r=Object.create(null);if(n.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var o in e)n.d(r,o,function(t){return e[t]}.bind(null,o));return r},n.n=function(e){var t=e&&e.__esModule?function(){return e["default"]}:function(){return e};return n.d(t,"a",t),t},n.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},n.p="",n(n.s="fb15")}({8875:function(e,t,n){var r,o,i;(function(n,s){o=[],r=s,i="function"===typeof r?r.apply(t,o):r,void 0===i||(e.exports=i)})("undefined"!==typeof self&&self,(function(){function e(){var t=Object.getOwnPropertyDescriptor(document,"currentScript");if(!t&&"currentScript"in document&&document.currentScript)return document.currentScript;if(t&&t.get!==e&&document.currentScript)return document.currentScript;try{throw new Error}catch(p){var n,r,o,i=/.*at [^(]*\((.*):(.+):(.+)\)$/gi,s=/@([^@]*):(\d+):(\d+)\s*$/gi,c=i.exec(p.stack)||s.exec(p.stack),u=c&&c[1]||!1,a=c&&c[2]||!1,l=document.location.href.replace(document.location.hash,""),d=document.getElementsByTagName("script");u===l&&(n=document.documentElement.outerHTML,r=new RegExp("(?:[^\\n]+?\\n){0,"+(a-2)+"}[^<]*<script>([\\d\\D]*?)<\\/script>[\\d\\D]*","i"),o=n.replace(r,"$1").trim());for(var f=0;f<d.length;f++){if("interactive"===d[f].readyState)return d[f];if(d[f].src===u)return d[f];if(u===l&&d[f].innerHTML&&d[f].innerHTML.trim()===o)return d[f]}return null}}return e}))},fb15:function(e,t,n){"use strict";if(n.r(t),"undefined"!==typeof window){var r=window.document.currentScript,o=n("8875");r=o(),"currentScript"in document||Object.defineProperty(document,"currentScript",{get:o});var i=r&&r.src.match(/(.+\/)[^/]+\.js(\?.*)?$/);i&&(n.p=i[1])}var s=function(){var e=this,t=e.$createElement,n=e._self._c||t;return n("div",[e.open?n("div",{staticClass:"overlay"},[n("div",{staticClass:"overlay-content"},[n("a",{staticClass:"overlay-closer",attrs:{href:"#"},on:{click:function(t){return e.handlerCloseSynthesis()}}},[e._v("Close")]),e._v(" OPTIONS ICI ")])]):e._e(),n("pre",[e._v(e._s(e.url))]),n("button",{staticClass:"btn btn-primary",on:{click:function(t){return e.handlerOpenSynthesis()}}},[n("i",{staticClass:"icon-calendar"}),e._v(" Synthèse des déclarations ")])])},c=[],u={props:{url:{require:!0}},data(){return{configuration:null,open:!1,synthese:null}},methods:{handlerOpenSynthesis(){this.open=!0,this.loadSynthesis()},handlerCloseSynthesis(){this.open=!1,console.log("CLOSE Synthesis")},loadSynthesis(){this.loading="Chargement de la synthèse...",this.$http.get(this.url).then(e=>{console.log(e)},e=>{})}},mounted(){console.log("ActivityTimesheetSynthesisMenu.vue")}},a=u;function l(e,t,n,r,o,i,s,c){var u,a="function"===typeof e?e.options:e;if(t&&(a.render=t,a.staticRenderFns=n,a._compiled=!0),r&&(a.functional=!0),i&&(a._scopeId="data-v-"+i),s?(u=function(e){e=e||this.$vnode&&this.$vnode.ssrContext||this.parent&&this.parent.$vnode&&this.parent.$vnode.ssrContext,e||"undefined"===typeof __VUE_SSR_CONTEXT__||(e=__VUE_SSR_CONTEXT__),o&&o.call(this,e),e&&e._registeredComponents&&e._registeredComponents.add(s)},a._ssrRegister=u):o&&(u=c?function(){o.call(this,(a.functional?this.parent:this).$root.$options.shadowRoot)}:o),u)if(a.functional){a._injectStyles=u;var l=a.render;a.render=function(e,t){return u.call(t),l(e,t)}}else{var d=a.beforeCreate;a.beforeCreate=d?[].concat(d,u):[u]}return{exports:e,options:a}}var d=l(a,s,c,!1,null,null,null),f=d.exports;t["default"]=f}})["default"]}));

//# sourceMappingURL=ActivityTimesheetSynthesisMenu.umd.min.js.map

 No newline at end of file

public/js/oscar/dist/ActivityTimesheetSynthesisMenu.umd.min.js.map

deleted100644 → 0

+0 −1

File deleted.

Preview size limit exceeded, changes collapsed.