Commit 5cae6811 authored by Stephane Bouvry's avatar Stephane Bouvry
Browse files

Fix : Affichage des montants avec l'espace comme séparateur des milliers... 

Fix : Affichage des montants avec l'espace comme séparateur des milliers (isolé dans VueFilters, et testé)
parent 6fc03c74

module/Oscar/view/oscar/project-grant/show.phtml

+5 −4
Changes for module/Oscar/view/oscar/project-grant/show.phtml: 5 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -400,7 +400,7 @@ 
                </div>



                <script>

                    require(['ActivityModel', 'vue','vue-resource', 'mm','payments'], function(ActivityModel, Vue, VueResource, moment, payments){

                    require(['ActivityModel', 'vue','vue-resource', 'mm','payments', 'VueFilters'], function(ActivityModel, Vue, VueResource, moment, payments, VueFilters){

                        Vue.use(VueResource);



                        Vue.filter('moment', function(value){
@@ -408,9 +408,10 @@ 
                            return m.format('D MMMM YYYY') + ' (' + m.fromNow() +')'

                        });



                        Vue.filter('money', function(value){

                            return Number.parseFloat(value).toFixed(2);

                        });

                        Vue.filter('money', VueFilters.default.money);

                        // Vue.filter('money', function(value){

                        //     return VueFilters.default.money(value);

                        // });



                        new Vue({ data: ActivityModel });

public/js/oscar/dist/Payments.css

0 → 100644
+2 −0
Changes for public/js/oscar/dist/Payments.css: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line 
.datepicker-selector[data-v-5bc1d1c4]{position:absolute;width:16em;z-index:1000;background:#fff;font-size:.9em;-webkit-box-shadow:0 0 1em rgba(0,0,0,.25);box-shadow:0 0 1em rgba(0,0,0,.25);border:thin solid rgba(0,0,0,.5)}.datepicker-selector .datepicker-wrapper[data-v-5bc1d1c4]{position:relative;z-index:900;background:#fff;padding:4px}.datepicker-selector[data-v-5bc1d1c4]:before{content:"";position:absolute;background:#fff;border:thin solid rgba(0,0,0,.5);width:16px;left:16px;height:16px;-webkit-transform:rotate(45deg);-ms-transform:rotate(45deg);transform:rotate(45deg);top:-8px;z-index:800}.datepicker-selector header nav[data-v-5bc1d1c4]{display:-webkit-box;display:-ms-flexbox;display:flex}.datepicker-selector header nav .heading[data-v-5bc1d1c4]{white-space:nowrap;text-align:center}.datepicker-selector header nav .currentMonth[data-v-5bc1d1c4],.datepicker-selector header nav .currentYear[data-v-5bc1d1c4]{cursor:pointer}.datepicker-selector header nav .currentMonth[data-v-5bc1d1c4]:hover,.datepicker-selector header nav .currentYear[data-v-5bc1d1c4]:hover{background:rgba(255,0,0,.5)}.datepicker-selector header nav>[data-v-5bc1d1c4]{-webkit-box-flex:1;-ms-flex:1;flex:1}.datepicker-selector header nav>span[data-v-5bc1d1c4]{-webkit-box-flex:0;-ms-flex:0;flex:0;cursor:pointer}.datepicker-selector header nav>span[data-v-5bc1d1c4]:hover{background:rgba(255,0,0,.5)}.datepicker-selector .day-labels[data-v-5bc1d1c4]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:stretch;-ms-flex-align:stretch;align-items:stretch}.datepicker-selector .day-labels .day-label[data-v-5bc1d1c4]{color:rgba(0,0,0,.5);-webkit-box-flex:1;-ms-flex:1;flex:1}.datepicker-selector .months[data-v-5bc1d1c4],.datepicker-selector .week[data-v-5bc1d1c4],.datepicker-selector .years[data-v-5bc1d1c4]{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;cursor:pointer}.datepicker-selector .months .month[data-v-5bc1d1c4]{-webkit-box-flex:1;-ms-flex:1;flex:1;width:33.333333333333336%;padding:.3em 0}.datepicker-selector .months .month[data-v-5bc1d1c4],.datepicker-selector .months .week-day[data-v-5bc1d1c4],.datepicker-selector .months .year[data-v-5bc1d1c4],.datepicker-selector .week .month[data-v-5bc1d1c4],.datepicker-selector .week .week-day[data-v-5bc1d1c4],.datepicker-selector .week .year[data-v-5bc1d1c4],.datepicker-selector .years .month[data-v-5bc1d1c4],.datepicker-selector .years .week-day[data-v-5bc1d1c4],.datepicker-selector .years .year[data-v-5bc1d1c4]{padding:.3em;-webkit-box-flex:1;-ms-flex:1;flex:1;text-align:center;border-radius:4px}.datepicker-selector .months .month[data-v-5bc1d1c4]:hover,.datepicker-selector .months .week-day[data-v-5bc1d1c4]:hover,.datepicker-selector .months .year[data-v-5bc1d1c4]:hover,.datepicker-selector .week .month[data-v-5bc1d1c4]:hover,.datepicker-selector .week .week-day[data-v-5bc1d1c4]:hover,.datepicker-selector .week .year[data-v-5bc1d1c4]:hover,.datepicker-selector .years .month[data-v-5bc1d1c4]:hover,.datepicker-selector .years .week-day[data-v-5bc1d1c4]:hover,.datepicker-selector .years .year[data-v-5bc1d1c4]:hover{background:rgba(255,0,0,.9);color:#fff}.datepicker-selector .months .month.active[data-v-5bc1d1c4],.datepicker-selector .months .week-day.active[data-v-5bc1d1c4],.datepicker-selector .months .year.active[data-v-5bc1d1c4],.datepicker-selector .week .month.active[data-v-5bc1d1c4],.datepicker-selector .week .week-day.active[data-v-5bc1d1c4],.datepicker-selector .week .year.active[data-v-5bc1d1c4],.datepicker-selector .years .month.active[data-v-5bc1d1c4],.datepicker-selector .years .week-day.active[data-v-5bc1d1c4],.datepicker-selector .years .year.active[data-v-5bc1d1c4]{background:rgba(255,0,0,.4)!important;text-shadow:-1px 1px 0 rgba(0,0,0,.3);color:#fff}.datepicker-selector .months .month.disabled[data-v-5bc1d1c4],.datepicker-selector .months .week-day.disabled[data-v-5bc1d1c4],.datepicker-selector .months .year.disabled[data-v-5bc1d1c4],.datepicker-selector .week .month.disabled[data-v-5bc1d1c4],.datepicker-selector .week .week-day.disabled[data-v-5bc1d1c4],.datepicker-selector .week .year.disabled[data-v-5bc1d1c4],.datepicker-selector .years .month.disabled[data-v-5bc1d1c4],.datepicker-selector .years .week-day.disabled[data-v-5bc1d1c4],.datepicker-selector .years .year.disabled[data-v-5bc1d1c4]{background:#fff!important;color:rgba(0,0,0,.2);pointer-events:none}.datepicker-selector .week[data-v-5bc1d1c4]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:stretch;-ms-flex-align:stretch;align-items:stretch;line-height:1em}.datepicker-selector .week .week-label[data-v-5bc1d1c4]{font-size:.8em;-webkit-box-flex:1;-ms-flex:1;flex:1;color:rgba(0,0,0,.5)}.datepicker-selector .week .week-day[data-v-5bc1d1c4]{text-align:center;-webkit-box-flex:1;-ms-flex:1;flex:1;padding:4px;cursor:pointer}.datepicker-selector .week .week-day[data-v-5bc1d1c4]:hover{background-color:rgba(255,0,0,.75)!important;color:#fff}.datepicker-selector .week .week-day[data-v-5bc1d1c4]:nth-child(odd){background:rgba(0,0,0,.05)}

/*# sourceMappingURL=Payments.css.map*/
 
 No newline at end of file

public/js/oscar/dist/Payments.css.map

0 → 100644
+1 −0
Changes for public/js/oscar/dist/Payments.css.map: 1 added line, 0 removed lines.
Original line number Diff line number Diff line 
{"version":3,"sources":["webpack:///./public/js/oscar/src/Datepicker.vue"],"names":[],"mappings":"AACA,sCACE,kBACA,WACA,aACA,gBACA,eACA,2CACQ,mCACR,gCAAsC,CAExC,0DACI,kBACA,YACA,gBACA,WAAa,CAEjB,6CACI,WACA,kBACA,gBACA,iCACA,WACA,UACA,YACA,gCACI,4BACI,wBACR,SACA,WAAa,CAEjB,iDACI,oBACA,oBACA,YAAc,CAElB,0DACM,mBACA,iBAAmB,CAEzB,6HACM,cAAgB,CAEtB,yIACQ,2BAAiC,CAEzC,kDACM,mBACI,WACI,MAAQ,CAEtB,sDACM,mBACI,WACI,OACR,cAAgB,CAEtB,4DACQ,2BAAiC,CAEzC,kDACI,oBACA,oBACA,aACA,0BACI,uBACI,mBAAqB,CAEjC,6DACM,qBACA,mBACI,WACI,MAAQ,CAEtB,uIACI,oBACA,oBACA,aACA,mBACI,eACJ,cAAgB,CAEpB,qDACI,mBACI,WACI,OACR,0BACA,cAAgB,CAEpB,0dACE,aACA,mBACI,WACI,OACR,kBACA,iBAAmB,CAErB,ghBACE,4BACA,UAAa,CAEf,yhBACE,sCACA,sCACA,UAAa,CAEf,2iBACE,0BACA,qBACA,mBAAqB,CAEvB,4CACE,oBACA,oBACA,aACA,0BACI,uBACI,oBACR,eAAiB,CAEnB,wDACE,eACA,mBACI,WACI,OACR,oBAA0B,CAE5B,sDACE,kBACA,mBACI,WACI,OACR,YACA,cAAgB,CAElB,4DACE,6CACA,UAAa,CAEf,qEACE,0BAAgC","file":"Payments.css","sourcesContent":["\n.datepicker-selector[data-v-5bc1d1c4] {\n  position: absolute;\n  width: 16em;\n  z-index: 1000;\n  background: white;\n  font-size: .9em;\n  -webkit-box-shadow: 0 0 1em rgba(0, 0, 0, 0.25);\n          box-shadow: 0 0 1em rgba(0, 0, 0, 0.25);\n  border: thin solid rgba(0, 0, 0, 0.5);\n}\n.datepicker-selector .datepicker-wrapper[data-v-5bc1d1c4] {\n    position: relative;\n    z-index: 900;\n    background: white;\n    padding: 4px;\n}\n.datepicker-selector[data-v-5bc1d1c4]:before {\n    content: '';\n    position: absolute;\n    background: white;\n    border: thin solid rgba(0, 0, 0, 0.5);\n    width: 16px;\n    left: 16px;\n    height: 16px;\n    -webkit-transform: rotate(45deg);\n        -ms-transform: rotate(45deg);\n            transform: rotate(45deg);\n    top: -8px;\n    z-index: 800;\n}\n.datepicker-selector header nav[data-v-5bc1d1c4] {\n    display: -webkit-box;\n    display: -ms-flexbox;\n    display: flex;\n}\n.datepicker-selector header nav .heading[data-v-5bc1d1c4] {\n      white-space: nowrap;\n      text-align: center;\n}\n.datepicker-selector header nav .currentMonth[data-v-5bc1d1c4], .datepicker-selector header nav .currentYear[data-v-5bc1d1c4] {\n      cursor: pointer;\n}\n.datepicker-selector header nav .currentMonth[data-v-5bc1d1c4]:hover, .datepicker-selector header nav .currentYear[data-v-5bc1d1c4]:hover {\n        background: rgba(255, 0, 0, 0.5);\n}\n.datepicker-selector header nav > *[data-v-5bc1d1c4] {\n      -webkit-box-flex: 1;\n          -ms-flex: 1;\n              flex: 1;\n}\n.datepicker-selector header nav > span[data-v-5bc1d1c4] {\n      -webkit-box-flex: 0;\n          -ms-flex: 0;\n              flex: 0;\n      cursor: pointer;\n}\n.datepicker-selector header nav > span[data-v-5bc1d1c4]:hover {\n        background: rgba(255, 0, 0, 0.5);\n}\n.datepicker-selector .day-labels[data-v-5bc1d1c4] {\n    display: -webkit-box;\n    display: -ms-flexbox;\n    display: flex;\n    -webkit-box-align: stretch;\n        -ms-flex-align: stretch;\n            align-items: stretch;\n}\n.datepicker-selector .day-labels .day-label[data-v-5bc1d1c4] {\n      color: rgba(0, 0, 0, 0.5);\n      -webkit-box-flex: 1;\n          -ms-flex: 1;\n              flex: 1;\n}\n.datepicker-selector .months[data-v-5bc1d1c4], .datepicker-selector .years[data-v-5bc1d1c4], .datepicker-selector .week[data-v-5bc1d1c4] {\n    display: -webkit-box;\n    display: -ms-flexbox;\n    display: flex;\n    -ms-flex-wrap: wrap;\n        flex-wrap: wrap;\n    cursor: pointer;\n}\n.datepicker-selector .months .month[data-v-5bc1d1c4] {\n    -webkit-box-flex: 1;\n        -ms-flex: 1;\n            flex: 1;\n    width: 33.3333333333333333%;\n    padding: .3em 0;\n}\n.datepicker-selector .months .month[data-v-5bc1d1c4], .datepicker-selector .months .year[data-v-5bc1d1c4], .datepicker-selector .months .week-day[data-v-5bc1d1c4], .datepicker-selector .years .month[data-v-5bc1d1c4], .datepicker-selector .years .year[data-v-5bc1d1c4], .datepicker-selector .years .week-day[data-v-5bc1d1c4], .datepicker-selector .week .month[data-v-5bc1d1c4], .datepicker-selector .week .year[data-v-5bc1d1c4], .datepicker-selector .week .week-day[data-v-5bc1d1c4] {\n  padding: .3em;\n  -webkit-box-flex: 1;\n      -ms-flex: 1;\n          flex: 1;\n  text-align: center;\n  border-radius: 4px;\n}\n.datepicker-selector .months .month[data-v-5bc1d1c4]:hover, .datepicker-selector .months .year[data-v-5bc1d1c4]:hover, .datepicker-selector .months .week-day[data-v-5bc1d1c4]:hover, .datepicker-selector .years .month[data-v-5bc1d1c4]:hover, .datepicker-selector .years .year[data-v-5bc1d1c4]:hover, .datepicker-selector .years .week-day[data-v-5bc1d1c4]:hover, .datepicker-selector .week .month[data-v-5bc1d1c4]:hover, .datepicker-selector .week .year[data-v-5bc1d1c4]:hover, .datepicker-selector .week .week-day[data-v-5bc1d1c4]:hover {\n  background: rgba(255, 0, 0, 0.9);\n  color: white;\n}\n.datepicker-selector .months .month.active[data-v-5bc1d1c4], .datepicker-selector .months .year.active[data-v-5bc1d1c4], .datepicker-selector .months .week-day.active[data-v-5bc1d1c4], .datepicker-selector .years .month.active[data-v-5bc1d1c4], .datepicker-selector .years .year.active[data-v-5bc1d1c4], .datepicker-selector .years .week-day.active[data-v-5bc1d1c4], .datepicker-selector .week .month.active[data-v-5bc1d1c4], .datepicker-selector .week .year.active[data-v-5bc1d1c4], .datepicker-selector .week .week-day.active[data-v-5bc1d1c4] {\n  background: rgba(255, 0, 0, 0.4) !important;\n  text-shadow: -1px 1px 0 rgba(0, 0, 0, 0.3);\n  color: white;\n}\n.datepicker-selector .months .month.disabled[data-v-5bc1d1c4], .datepicker-selector .months .year.disabled[data-v-5bc1d1c4], .datepicker-selector .months .week-day.disabled[data-v-5bc1d1c4], .datepicker-selector .years .month.disabled[data-v-5bc1d1c4], .datepicker-selector .years .year.disabled[data-v-5bc1d1c4], .datepicker-selector .years .week-day.disabled[data-v-5bc1d1c4], .datepicker-selector .week .month.disabled[data-v-5bc1d1c4], .datepicker-selector .week .year.disabled[data-v-5bc1d1c4], .datepicker-selector .week .week-day.disabled[data-v-5bc1d1c4] {\n  background: white !important;\n  color: rgba(0, 0, 0, 0.2);\n  pointer-events: none;\n}\n.datepicker-selector .week[data-v-5bc1d1c4] {\n  display: -webkit-box;\n  display: -ms-flexbox;\n  display: flex;\n  -webkit-box-align: stretch;\n      -ms-flex-align: stretch;\n          align-items: stretch;\n  line-height: 1em;\n}\n.datepicker-selector .week .week-label[data-v-5bc1d1c4] {\n  font-size: .8em;\n  -webkit-box-flex: 1;\n      -ms-flex: 1;\n          flex: 1;\n  color: rgba(0, 0, 0, 0.5);\n}\n.datepicker-selector .week .week-day[data-v-5bc1d1c4] {\n  text-align: center;\n  -webkit-box-flex: 1;\n      -ms-flex: 1;\n          flex: 1;\n  padding: 4px;\n  cursor: pointer;\n}\n.datepicker-selector .week .week-day[data-v-5bc1d1c4]:hover {\n  background-color: rgba(255, 0, 0, 0.75) !important;\n  color: white;\n}\n.datepicker-selector .week .week-day[data-v-5bc1d1c4]:nth-child(odd) {\n  background: rgba(0, 0, 0, 0.05);\n}\n\n\n\n// WEBPACK FOOTER //\n// ./public/js/oscar/src/Datepicker.vue"],"sourceRoot":""}
 
 No newline at end of file

public/js/oscar/dist/Payments.js

+1 −1

File changed.

Preview size limit exceeded, changes collapsed.

public/js/oscar/dist/Payments.js.map

+1 −1

File changed.

Preview size limit exceeded, changes collapsed.