wip refonte piece justificative et vuejs (2eeb713c) · Commits · open-source / OSE

code/QueryCompare.php

+5 −6

Original line number	Diff line number	Diff line
		@@ -6,12 +6,12 @@
		*/

		$sql1 = "SELECT tbj.* FROM tbl_piece_jointe tbj
		--where intervenant_id = 633563
		--where intervenant_id = 825820
		--JOIN intervenant i ON i.id = tbj.intervenant_id
		--JOIN piece_jointe pj ON pj.id = tbj.piece_jointe_id";

		$sql2 = "SELECT tbjo.* FROM tbl_piece_jointe_old2 tbjo
		--where intervenant_id = 633563
		--where intervenant_id = 825820
		-- JOIN intervenant i ON i.id = tbjo.intervenant_id
		--JOIN piece_jointe pj ON pj.id = tbjo.piece_jointe_id";

		@@ -26,10 +26,9 @@ $ignoreCols = [
		'DEMANDEE_APRES_RECRUTEMENT',
		'DATE_ORIGINE',
		'DATE_VALIDITEE',
		'SEUIL_HETD',
		'HEURES_POUR_SEUIL',
		'ID',
		'PIECE_JOINTE_ID'
		'PIECE_JOINTE_ID',
		'HEURES_POUR_SEUIL',

		// colonne supprimée
		];
		@@ -50,7 +49,7 @@ $comparator->setKeyColumns($keyCols);
		$comparator->setIgnoreColumns($ignoreCols);
		$comparator->setOnlyColumns($onlyCols);

		$comparator->setLimit(100);
		//$comparator->setLimit(100);

		$result = $comparator->run();

+1 −1

Original line number	Diff line number	Diff line
		@@ -10,7 +10,7 @@
		$stbl = $container->get(\UnicaenTbl\Service\TableauBordService::class);

		$data = [//'INTERVENANT_ID' => '9290',
		'INTERVENANT_ID' => 9290,
		'INTERVENANT_ID' => 194861,
		//'ANNEE_ID' => 2015,
		];
		//$data = [];

+0 −12

Original line number	Diff line number	Diff line
		@@ -141,18 +141,6 @@ return [
		'position' => 11,
		'commentaire' => '',
		],
		'SEUIL_HETD' => [
		'name' => 'SEUIL_HETD',
		'type' => 'float',
		'bdd-type' => 'FLOAT',
		'length' => 0,
		'scale' => null,
		'precision' => 126,
		'nullable' => false,
		'default' => '0',
		'position' => 12,
		'commentaire' => 'NB d\'heures de seuil pour la demande',
		],
		'DEMANDEE_APRES_RECRUTEMENT' => [
		'name' => 'DEMANDEE_APRES_RECRUTEMENT',
		'type' => 'int',

+7 −7

Original line number	Diff line number	Diff line
		@@ -82,7 +82,9 @@
		<table class="table table-sm ">
		<thead>
		<th scope="col" style="width:20%;font-size:12px;">Heures</th>
		<th scope="col" style="width:40%;font-size:12px;">Centre de coûts</th>
		<th scope="col" style="width:40%;font-size:12px;">Centre de
		coûts
		</th>
		<th scope="col" style="width:25%;font-size:12px;">État</th>
		<th style="width:15%;font-size:12px;"></th>
		</thead>
		@@ -549,10 +551,7 @@ export default {


		name: "DemandeMiseEnPaiementStructure",
		props: {
		datas: {required: true},
		intervenant: {required: true},
		},
		props: {},
		computed:
		{
		datasBudget()
		@@ -673,7 +672,8 @@ export default {
		//Si le nombre d'heure demandées est supérieur au nombre d'heures maximum pour cette ligne
		if (heureADemander > 0 && heureADemander > heureADemanderMax) {
		unicaenVue.flashMessenger.toast("Demande de mise en paiement impossible, vous demandez " + heureADemander + " hetd(s) alors que vous pouvez demander maximum " + heureADemanderMax + " hetd(s)", 'error', options);
		this.$emit('refresh-btn-state');;
		this.$emit('refresh-btn-state');
		;
		return false;
		}

+23 −15

Original line number	Diff line number	Diff line
		<template>
		<div>
		<h1>Liste pieces jointes</h1>
		<piece-jointe/>
		<pieceJointe v-for="(pieceJointe, key) in datasPiecesJointes"
		:datas="pieceJointe"
		:intervenant="intervenant"></pieceJointe>

		</div>
		</template>

		<script>

		import taux from './PieceJointe.vue';
		import PieceJointe from "@/PieceJointe/PieceJointe.vue";
		import pieceJointe from './PieceJointe.vue';


		export default {
		components: {PieceJointe},
		props: {},
		components: {
		pieceJointe
		},
		props: {
		intervenant: {required: true},
		},
		data()
		{
		return {
		listePiecesJointes: [],
		};
		datasPiecesJointes: null,
		urlGetPiecesJointes: unicaenVue.url('piece-jointe/intervenant/:intervenant/get-pieces-jointes', {intervenant: this.intervenant}),
		}

		},
		mounted()
		{
		this.reload();
		this.getPiecesJointes();
		},
		methods: {

		reload()
		getPiecesJointes()
		{
		/* unicaenVue.axios.get(
		unicaenVue.url("taux/liste-taux")
		).then(response => {
		this.listeTaux = response.data;
		});*/
		unicaenVue.axios.get(this.urlGetPiecesJointes).then(response => {
		this.datasPiecesJointes = response.data;
		}).catch(error => {
		console.error(error);
		})

		},
		}
		}