Base pour refonte de la synthèse (276aef6a) · Commits · open-source / oscar

front/gulpfile.js

+11 −1

Original line number	Diff line number	Diff line
		@@ -2,7 +2,7 @@ const { watch, src, dest } = require('gulp');
		const exec = require('child_process').exec;

		const pathModuleSrc = './src/';
		const pathModuleDest = './../public/js/oscar/dist/'
		const pathModuleDest = './../public/js/oscar/dist/';


		////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
		@@ -96,6 +96,16 @@ exports.createProcessusPCRUWatch = function(cb){
		watch(pathModuleSrc + "CreateProcessusPCRU.vue", createProcessusPCRU);
		}

		//// 2.6 Bouton de synthèse Feuille de temps
		function activityTimesheetSynthesisMenu(cb) {
		compile("ActivityTimesheetSynthesisMenu");
		cb();
		}
		exports.activityTimesheetSynthesisMenu = activityTimesheetSynthesisMenu;
		exports.activityTimesheetSynthesisMenuWatch = function(cb){
		watch(pathModuleSrc + "ActivityTimesheetSynthesisMenu.vue", activityTimesheetSynthesisMenu);
		}

		////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
		//// 3. COMPOSANTS
		///////////////////////// COMPOSANTS COMPILES

+6 −6

Original line number	Diff line number	Diff line
		@@ -3316,9 +3316,9 @@
		}
		},
		"chalk": {
		"version": "4.1.0",
		"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
		"integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
		"version": "4.1.2",
		"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
		"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
		"dev": true,
		"optional": true,
		"requires": {
		@@ -3487,9 +3487,9 @@
		}
		},
		"vue-loader-v16": {
		"version": "npm:vue-loader@16.1.1",
		"resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.1.1.tgz",
		"integrity": "sha512-wz/+HFg/3SBayHWAlZXARcnDTl3VOChrfW9YnxvAweiuyKX/7IGx1ad/4yJHmwhgWlOVYMAbTiI7GV8G33PfGQ==",
		"version": "npm:vue-loader@16.5.0",
		"resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.5.0.tgz",
		"integrity": "sha512-WXh+7AgFxGTgb5QAkQtFeUcHNIEq3PGVQ8WskY5ZiFbWBkOwcCPRs4w/2tVyTbh2q6TVRlO3xfvIukUtjsu62A==",
		"dev": true,
		"optional": true,
		"requires": {

0 → 100644

+79 −0

Original line number	Diff line number	Diff line
		<template>
		<div>
		<div class="overlay" v-if="open">
		<div class="overlay-content">
		<a href="#" class="overlay-closer" @click="handlerCloseSynthesis()">Close</a>
		OPTIONS ICI
		</div>
		</div>
		<pre>{{ url }}</pre>
		<button class="btn btn-primary" @click="handlerOpenSynthesis()">
		<i class="icon-calendar"></i>
		Synthèse des déclarations
		</button>
		</div>
		</template>
		<script>
		/******************************************************************************************************************/
		/* ! 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
		export default {

		// 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")
		}

		}
		</script>
		No newline at end of file

+4 −3

Original line number	Diff line number	Diff line
		@@ -169,10 +169,11 @@ class PublicController extends AbstractOscarController implements UseTimesheetSe

		public function testAction()
		{

		die("TEST d'EVENT");
		if( DEBUG_OSCAR ){
		return [];
		}
		die("to test");
		}

		/**
		* Page d'accueil.

+1 −1

Original line number	Diff line number	Diff line
		@@ -803,7 +803,7 @@ class TimesheetController extends AbstractOscarController

		}

		if( $format == "json" ){
		if( $format == "json" \|\| $this->isAjax() ){
		return $this->jsonOutput($datas);
		}