mirror of
				https://gitlab.com/Chill-Projet/chill-bundles.git
				synced 2025-10-31 17:28:23 +00:00 
			
		
		
		
	Compare commits
	
		
			1 Commits
		
	
	
		
			710_vendee
			...
			upgrade-ph
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| d1a4891b9d | 
| @@ -2,11 +2,20 @@ | ||||
|  | ||||
| <!-- https://phpunit.readthedocs.io/en/latest/configuration.html --> | ||||
| <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||||
|          xsi:noNamespaceSchemaLocation="tests/app/vendor/phpunit/phpunit/phpunit.xsd" | ||||
|          xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.6/phpunit.xsd" | ||||
|          backupGlobals="false" | ||||
|          colors="true" | ||||
|          bootstrap="tests/app/tests/bootstrap.php" | ||||
| > | ||||
|          cacheResultFile=".phpunit.cache/test-results" | ||||
|          executionOrder="depends,defects" | ||||
|          forceCoversAnnotation="true" | ||||
|          beStrictAboutCoversAnnotation="true" | ||||
|          beStrictAboutOutputDuringTests="true" | ||||
|          beStrictAboutTodoAnnotatedTests="true" | ||||
|          convertDeprecationsToExceptions="true" | ||||
|          failOnRisky="true" | ||||
|          failOnWarning="true" | ||||
|          verbose="true"> | ||||
|     <php> | ||||
|         <ini name="error_reporting" value="-1" /> | ||||
|         <server name="APP_ENV" value="test" force="true" /> | ||||
|   | ||||
| @@ -122,8 +122,7 @@ | ||||
|          <add-evaluation | ||||
|             v-for="e in pickedEvaluations" | ||||
|             v-bind:key="e.key" | ||||
|             v-bind:evaluation="e" | ||||
|             v-bind:docAnchorId="this.docAnchorId"> | ||||
|             v-bind:evaluation="e"> | ||||
|          </add-evaluation> | ||||
|  | ||||
|          <!-- box to add new evaluation --> | ||||
| @@ -390,7 +389,6 @@ export default { | ||||
|    i18n, | ||||
|    data() { | ||||
|       return { | ||||
|          docAnchorId: null, | ||||
|          isExpanded: false, | ||||
|          editor: ClassicEditor, | ||||
|          showAddObjective: false, | ||||
| @@ -430,14 +428,7 @@ export default { | ||||
|          }, | ||||
|       }; | ||||
|    }, | ||||
|    beforeMount() { | ||||
|        const urlParams = new URLSearchParams(window.location.search); | ||||
|        this.docAnchorId = urlParams.get('doc_id'); | ||||
|    }, | ||||
|    mounted() { | ||||
|      this.scrollToElement(this.docAnchorId); | ||||
|    }, | ||||
|   computed: { | ||||
|    computed: { | ||||
|       ...mapState([ | ||||
|          'work', | ||||
|          'resultsForAction', | ||||
| @@ -568,7 +559,7 @@ export default { | ||||
|          }); | ||||
|       }, | ||||
|       saveFormOnTheFly(payload) { | ||||
|          // console.log('saveFormOnTheFly: type', payload.type, ', data', payload.data); | ||||
|          console.log('saveFormOnTheFly: type', payload.type, ', data', payload.data); | ||||
|  | ||||
|          let body = { type: payload.type }; | ||||
|          body.name = payload.data.text; | ||||
| @@ -590,12 +581,6 @@ export default { | ||||
|                      this.$toast.open({message: 'An error occurred'}); | ||||
|                } | ||||
|             }) | ||||
|       }, | ||||
|       scrollToElement(docAnchorId) { | ||||
|          const documentEl = document.getElementById(`document_${docAnchorId}`); | ||||
|          if (documentEl) { | ||||
|            documentEl.scrollIntoView({behavior: 'smooth'}); | ||||
|          } | ||||
|       } | ||||
|    } | ||||
| }; | ||||
|   | ||||
| @@ -11,7 +11,7 @@ | ||||
|       </div> | ||||
|  | ||||
|       <div> | ||||
|          <form-evaluation ref="FormEvaluation" :key="evaluation.key" :evaluation="evaluation" :docAnchorId="docAnchorId"></form-evaluation> | ||||
|          <form-evaluation ref="FormEvaluation" :key="evaluation.key" :evaluation="evaluation"></form-evaluation> | ||||
|  | ||||
|         <ul class="record_actions"> | ||||
|            <li v-if="evaluation.workflows_availables.length > 0"> | ||||
| @@ -85,7 +85,7 @@ export default { | ||||
|       Modal, | ||||
|       ListWorkflowModal, | ||||
|    }, | ||||
|    props: ['evaluation', 'docAnchorId'], | ||||
|    props: ['evaluation'], | ||||
|    i18n, | ||||
|    data() { | ||||
|       return { | ||||
|   | ||||
| @@ -80,20 +80,19 @@ | ||||
|  | ||||
|        <div class="flex-table"> | ||||
|          <div class="item-bloc" v-for="(d, i) in evaluation.documents" :key="d.id"> | ||||
|            <div :id="`document_${d.id}`" class="item-row"> | ||||
|            <div class="item-row"> | ||||
|             <div class="input-group input-group-lg mb-3 row"> | ||||
|                   <label class="col-sm-3 col-form-label">Titre du document:</label> | ||||
|                   <div class="col-sm-9"> | ||||
|                     <input | ||||
|                         class="form-control document-title" | ||||
|                         :class="[parseInt(this.docAnchorId) === d.id ? 'bg-blink' : 'nothing']" | ||||
|                         type="text" | ||||
|                         :value="d.title" | ||||
|                         :id="d.id" | ||||
|                         :data-key="i" | ||||
|                         @input="onInputDocumentTitle"/> | ||||
|                 </div> | ||||
|            </div> | ||||
|                </div> | ||||
|            </div> | ||||
|            <div class="item-row"> | ||||
|                <div class="item-col item-meta"> | ||||
| @@ -222,7 +221,7 @@ const i18n = { | ||||
|  | ||||
| export default { | ||||
|    name: "FormEvaluation", | ||||
|    props: ['evaluation', 'docAnchorId'], | ||||
|    props: ['evaluation'], | ||||
|    components: { | ||||
|       ckeditor: CKEditor.component, | ||||
|       PickTemplate, | ||||
| @@ -403,19 +402,4 @@ export default { | ||||
|    ul.document-upload { | ||||
|       justify-content: flex-start; | ||||
|    } | ||||
|  | ||||
|    .bg-blink{ | ||||
|      color: #050000; | ||||
|      padding: 10px; | ||||
|      display: inline-block; | ||||
|      border-radius: 5px; | ||||
|      animation: blinkingBackground 2.2s infinite; | ||||
|      animation-iteration-count: 2; | ||||
|    } | ||||
|  | ||||
|    @keyframes blinkingBackground{ | ||||
|      0%		{ background-color: #ed776d;} | ||||
|      50%		{ background-color: #ffffff;} | ||||
|      100%	  { background-color: #ed776d;} | ||||
|    } | ||||
| </style> | ||||
|   | ||||
| @@ -123,7 +123,7 @@ | ||||
|         <ul class="record_actions"> | ||||
|             <li>{{ doc.storedObject|chill_document_button_group(doc.title, is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_UPDATE', evaluation.accompanyingPeriodWork)) }}</li> | ||||
|             <li> | ||||
|                 <a class="btn btn-show" href="{{ path('chill_person_accompanying_period_work_edit', {'id': evaluation.accompanyingPeriodWork.id, 'doc_id': doc.id}) }}"> | ||||
|                 <a class="btn btn-show" href="{{ path('chill_person_accompanying_period_work_edit', {'id': evaluation.accompanyingPeriodWork.id}) }}"> | ||||
|                     {{ 'Show'|trans }} | ||||
|                 </a> | ||||
|             </li> | ||||
|   | ||||
		Reference in New Issue
	
	Block a user