Commit 49f3dc8f authored by Stephane Bouvry's avatar Stephane Bouvry
Browse files

- Migration SpentGroup vers Vite 

 - Liste interactive des Jalons dans la fiche Projet/Activité
 - Fix UI
parent 4340446e

module/Oscar/view/oscar/depense/manage-spend-type-group.phtml

+9 −0
Original line number Diff line number Diff line
@@ -7,7 +7,14 @@ 
 */

?>

<div class="container">

    <div id="app"

         data-url="<?= $this->url('administration/accounts') ?>"

         data-manage="<?= $this->url('depense/manage') ?>"></div>

    <?php $this->Vite()->addJs('src/AdminSpentGroup.js'); ?>

    <?php /**

    <div id="app"></div>

    <?php $this->Vite()->addJs('js/AdminProcess.js'); ?>

    <!--

    <script>

        require(['vue', 'vue-resource', 'SpentGroupAdmin', 'SpentGroupItem'], function(Vue, VueResource, SpentGroupAdmin, SpentGroupItem){

            Vue.use(VueResource);
@@ -25,4 +32,6 @@ 
            })

        })

    </script>

    -->

</div>

 * /****/ ?>

module/Oscar/view/oscar/project/show2.phtml

+1 −0
Original line number Diff line number Diff line 
<div class="container">

    <div class="activity" id="project"

            <?php if( DEBUG_OSCAR ) echo 'data-debug-enabled="true"' ?>

         data-activity-url="<?php echo $this->url('contract/show', ['id' => ""]) ?>"

         data-url="<?php echo $this->url('project/show2', ['id' => $project->getId()]) ?>"

         data-enrole-with-date="<?= $this->oscarConfig("enroleWithDate", true) ? "" : "false"  ?>"

         data-manage="<?php $this->grant()->privilege(\Oscar\Provider\Privileges::PROJECT_EDIT, $project) ? "true" : "false" ?>"

ui/src/AdminSpentGroup.js

0 → 100644
+39 −0
Original line number Diff line number Diff line 
import { createApp } from "vue";

import SpentGroupAdmin from "./views/administration/SpentGroupAdmin.vue";

import SpentGroupItem from "./views/administration/SpentGroupItem.vue";

import PrimeVue from "primevue/config";

import {oscarText} from "./utils/OscarText.js";

import Aura from '@primeuix/themes/aura';



let elemID = "#app";



let elemDatas = document.querySelector(elemID);



let manage = false;

let url = "";

try{

    manage = elemDatas.dataset.manage;

    url = elemDatas.dataset.url;

} catch (err){

    console.error(err);

}



const app = createApp(SpentGroupAdmin, {

    "manage": manage,

    "url": url

});



app.use(PrimeVue, {

    theme: {

        preset: Aura

    }

});



app.config.globalProperties.$filters = {

    oscarText

};





app.component("spenttypeitem", SpentGroupItem);



app.mount(elemID);

ui/src/Project.js

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ let elemId = '#project'; 
let elemDatas = document.querySelector(elemId);

const app = createApp(Project, {

    "url": elemDatas.dataset.url,

    "activity_url": elemDatas.dataset.activityUrl,

    "debug-enabled": elemDatas.dataset.debugEnabled,

    "params": extractJsonFromBase64(elemDatas.dataset.params),

    "enrole-with-date": elemDatas.dataset.enroleWithDate !== 'false',

ui/src/views/Activity.vue

+1 −2
Original line number Diff line number Diff line
@@ -919,7 +919,6 @@ 
            Dépenses indisponibles : {{ spents.enabled_reason }}

          </div>

          <div v-else>

            <ActivitySpentSynthesis

            <ActivitySpentSynthesis

                :standalone="false"

                :show-count="false"
@@ -1018,6 +1017,7 @@ export default { 


  props: {

    url: {required: true},

    activity_url: String,

    debugEnabled: {required: false, type: Boolean, default: false},

    enroleWithDate: { default: true, type: Boolean }

  },
@@ -1089,7 +1089,6 @@ export default { 
  },

  watch:{

    uiActiveTab(){

      console.log(this.uiActiveTab);

      window.localStorage.setItem(ACTIVITY_TAB_ACTIVE_STOREKEY, this.uiActiveTab);

    }

  },