diff --git a/public/js/app.js b/public/js/app.js index ec9b5a9..504d5f0 100644 --- a/public/js/app.js +++ b/public/js/app.js @@ -17187,6 +17187,10 @@ __webpack_require__.r(__webpack_exports__); // // // +// +// +// +// var formatter = new Intl.NumberFormat('en-US', { minimumFractionDigits: 2 }); @@ -17219,7 +17223,6 @@ var formatter = new Intl.NumberFormat('en-US', { } }).then(function (response) { _this.arrayBajet = response.data; - console.log(_this.arrayBajet); }); } } @@ -72144,34 +72147,99 @@ var render = function () { ]), _vm._v(" "), _vm.pilihantahun != "none" - ? _vm._l(Object.entries(_vm.arrayBajet), function (bajet, i) { + ? _vm._l(_vm.arrayBajet, function (bajet, i) { return _c( "div", { key: i, staticClass: - "border-4 border-gray-400 rounded-lg mt-6 cursor-pointer", + "border-4 border-gray-400 hover:border-yellow-400 rounded-lg mt-3 hover:transition-all cursor-pointer transition transform hover:-translate-x-1 ", }, [ _c("div", { staticClass: "flex flex-wrap mb-3 p-4" }, [ _c("h4", { staticClass: "font-bold w-1/6 m-auto text-2xl" }, [ - _vm._v(_vm._s(bajet[0])), + _vm._v(_vm._s(String(Object.keys(_vm.arrayBajet[i])))), ]), _vm._v(" "), _c( "div", { staticClass: "w-1/4 grid-rows-4" }, - _vm._l(bajet[1], function (bajetdata, x) { - return _c("p", { key: x, staticClass: "m-1" }, [ - _vm._v(_vm._s(bajetdata.bulan) + " : "), - _c("span", [ + _vm._l( + bajet[Object.keys(_vm.arrayBajet[i])], + function (bajetdata, a) { + return _c("p", { key: a, staticClass: "m-1" }, [ _vm._v( - "RM " + - _vm._s(_vm.formatexchange(bajetdata.nilaibajet)) + _vm._s(4 >= a ? bajetdata.bulan + ":" : "") + " " ), - ]), - ]) - }), + 4 >= a + ? _c("span", [ + _vm._v( + "RM " + + _vm._s( + _vm.formatexchange(bajetdata.nilaibajet) + ) + ), + ]) + : _vm._e(), + ]) + } + ), + 0 + ), + _vm._v(" "), + _c( + "div", + { staticClass: "w-1/4 grid-rows-4" }, + _vm._l( + bajet[Object.keys(_vm.arrayBajet[i])], + function (bajetdata, a) { + return _c("p", { key: a, staticClass: "m-1" }, [ + _vm._v( + _vm._s( + a >= 5 && 9 >= a ? bajetdata.bulan + ":" : "" + ) + " " + ), + a >= 5 && 9 >= a + ? _c("span", [ + _vm._v( + "RM " + + _vm._s( + _vm.formatexchange(bajetdata.nilaibajet) + ) + ), + ]) + : _vm._e(), + ]) + } + ), + 0 + ), + _vm._v(" "), + _c( + "div", + { staticClass: "w-1/4 grid-rows-4" }, + _vm._l( + bajet[Object.keys(_vm.arrayBajet[i])], + function (bajetdata, a) { + return _c("p", { key: a, staticClass: "m-1" }, [ + _vm._v( + _vm._s( + a >= 10 && 13 >= a ? bajetdata.bulan + ":" : "" + ) + " " + ), + a >= 10 && 13 >= a + ? _c("span", [ + _vm._v( + "RM " + + _vm._s( + _vm.formatexchange(bajetdata.nilaibajet) + ) + ), + ]) + : _vm._e(), + ]) + } + ), 0 ), ]), diff --git a/resources/js/Bajet/Senaraibajet.vue b/resources/js/Bajet/Senaraibajet.vue index 13294aa..4b8527e 100644 --- a/resources/js/Bajet/Senaraibajet.vue +++ b/resources/js/Bajet/Senaraibajet.vue @@ -22,15 +22,19 @@ @@ -68,7 +72,6 @@ export default { } }).then( response => { this.arrayBajet = response.data - console.log(this.arrayBajet) }); }