root/THANASOFT-HFC
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'features/feature-order-product-on-agenda' into staging

Browse Source
This commit is contained in:
Tiavina 2025-01-14 13:51:34 +03:00
commit 075835211a
11 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
calendar/js/calendar-main.js
View File

@ -22007,7 +22007,7 @@ var render = function render() {
}), _vm._v(" "), _c("PropertySelectArticle", {
staticClass: "property-description",
attrs: {
url: "/apps/gestion/ajaxGetProduits",
url: "/apps/gestion/ajaxGetProduits?orderDirection=ASC",
"is-read-only": _vm.isReadOnly,
"prop-model": _vm.rfcProps.articles,
value: _vm.description,
@ -22569,7 +22569,7 @@ var render = function render() {
}), _vm._v(" "), _c("PropertySelectArticle", {
attrs: {
"is-read-only": _vm.isReadOnlyOrViewing,
url: "/apps/gestion/ajaxGetProduits",
url: "/apps/gestion/ajaxGetProduits?orderDirection=ASC",
"prop-model": _vm.rfcProps.articles,
value: _vm.description,
"linkify-links": true
@ -310253,4 +310253,4 @@ appointmentsConfigsStore.addInitialConfigs((0,_nextcloud_initial_state__WEBPACK_
/******/ })()
;
//# sourceMappingURL=calendar-main.js.map?v=30e87e64d6ce046440b7
//# sourceMappingURL=calendar-main.js.map?v=baa756356549c2cc0dfb

2
calendar/js/calendar-main.js.map
View File

File diff suppressed because one or more lines are too long

4
calendar/js/calendar-reference.js
View File

@ -8865,7 +8865,7 @@ window._registerCustomPickerElement = _;
/******/ // This function allow to reference async chunks
/******/ __webpack_require__.u = (chunkId) => {
/******/ // return url for filenames based on template
/******/ return "calendar-" + chunkId + ".js?v=" + {"vendors-node_modules_vue_dist_vue_runtime_esm_js":"7e3171593bdc0f62040b","vendors-node_modules_nextcloud_capabilities_dist_index_js-node_modules_nextcloud_vue-select_d-877981":"31a7d4ece3cdde2d67f1","vendors-node_modules_nextcloud_cdav-library_dist_dist_js-node_modules_nextcloud_logger_dist_i-36c16b":"c3b3db23da041c717fc1","vendors-node_modules_vue-material-design-icons_CalendarBlank_vue-node_modules_vue-material-de-e2c1f8":"1ec24b5ef07652c6dd39","vendors-node_modules_vue-material-design-icons_CalendarBlankOutline_vue-node_modules_nextclou-4adead":"702892edfb255629754c","vendors-node_modules_autosize_dist_autosize_esm_js-node_modules_html-entities_lib_index_js-no-4072c5":"7212b31e059bc10c256e","src_models_rfcProps_js-src_services_caldavService_js-src_services_talkService_js-src_services-8a2790":"7cf71b4f92d5bbc180b4","src_fullcalendar_eventSources_eventSourceFunction_js-src_utils_moment_js-data_image_svg_xml_3-b73258":"740a2859d1f364b508c1","src_views_Calendar_vue-data_image_svg_xml_3csvg_20xmlns_27http_www_w3_org_2000_svg_27_20heigh-4a4254":"2cfe366ffc76e23c8b93","vendors-node_modules_webdav_dist_web_index_js":"454da8f908d41b47c607","src_store_index_js":"0338b9a6ef0b356d96af","vendors-node_modules_path-browserify_index_js-node_modules_nextcloud_dialogs_dist_chunks_Dial-e0595f":"7ec0cf6b65f5c745fa03","node_modules_nextcloud_dialogs_dist_legacy_mjs":"8be838e4c6e9aae56c87","vendors-node_modules_nextcloud_dialogs_dist_chunks_FilePicker-8ibBgPg__mjs":"ea54a36450de178d1141","public-calendar-subscription-picker":"2315e24e67ebf6e4b6db","vendors-node_modules_moment_locale_af_js-node_modules_moment_locale_ar-dz_js-node_modules_mom-582c96":"ce1bed825f57dd1d117a","node_modules_moment_locale_sync_recursive_":"4bc2c39c5e0ff182c2e3"}[chunkId] + "";
/******/ return "calendar-" + chunkId + ".js?v=" + {"vendors-node_modules_vue_dist_vue_runtime_esm_js":"7e3171593bdc0f62040b","vendors-node_modules_nextcloud_capabilities_dist_index_js-node_modules_nextcloud_vue-select_d-877981":"31a7d4ece3cdde2d67f1","vendors-node_modules_nextcloud_cdav-library_dist_dist_js-node_modules_nextcloud_logger_dist_i-36c16b":"c3b3db23da041c717fc1","vendors-node_modules_vue-material-design-icons_CalendarBlank_vue-node_modules_vue-material-de-e2c1f8":"1ec24b5ef07652c6dd39","vendors-node_modules_vue-material-design-icons_CalendarBlankOutline_vue-node_modules_nextclou-4adead":"702892edfb255629754c","vendors-node_modules_autosize_dist_autosize_esm_js-node_modules_html-entities_lib_index_js-no-4072c5":"7212b31e059bc10c256e","src_models_rfcProps_js-src_services_caldavService_js-src_services_talkService_js-src_services-8a2790":"7cf71b4f92d5bbc180b4","src_fullcalendar_eventSources_eventSourceFunction_js-src_utils_moment_js-data_image_svg_xml_3-b73258":"740a2859d1f364b508c1","src_views_Calendar_vue-data_image_svg_xml_3csvg_20xmlns_27http_www_w3_org_2000_svg_27_20heigh-4a4254":"5307ae844eb83db74a98","vendors-node_modules_webdav_dist_web_index_js":"454da8f908d41b47c607","src_store_index_js":"0338b9a6ef0b356d96af","vendors-node_modules_path-browserify_index_js-node_modules_nextcloud_dialogs_dist_chunks_Dial-e0595f":"7ec0cf6b65f5c745fa03","node_modules_nextcloud_dialogs_dist_legacy_mjs":"8be838e4c6e9aae56c87","vendors-node_modules_nextcloud_dialogs_dist_chunks_FilePicker-8ibBgPg__mjs":"ea54a36450de178d1141","public-calendar-subscription-picker":"2315e24e67ebf6e4b6db","vendors-node_modules_moment_locale_af_js-node_modules_moment_locale_ar-dz_js-node_modules_mom-582c96":"ce1bed825f57dd1d117a","node_modules_moment_locale_sync_recursive_":"4bc2c39c5e0ff182c2e3"}[chunkId] + "";
/******/ };
/******/ })();
/******/
@ -9115,4 +9115,4 @@ __webpack_require__.p = (0,_nextcloud_router__WEBPACK_IMPORTED_MODULE_1__.linkTo
/******/ })()
;
//# sourceMappingURL=calendar-reference.js.map?v=82be2390c842a6f2ecba
//# sourceMappingURL=calendar-reference.js.map?v=a7adcb947a9e7b3719aa

2
calendar/js/calendar-reference.js.map
View File

File diff suppressed because one or more lines are too long

4
calendar/js/calendar-src_views_Calendar_vue-data_image_svg_xml_3csvg_20xmlns_27http_www_w3_org_2000_svg_27_20heigh-4a4254.js
View File

@ -14345,7 +14345,7 @@ var render = function render() {
}), _vm._v(" "), _c("PropertySelectArticle", {
attrs: {
"is-read-only": _vm.isReadOnlyOrViewing,
url: "/apps/gestion/ajaxGetProduits",
url: "/apps/gestion/ajaxGetProduits?orderDirection=ASC",
"prop-model": _vm.rfcProps.articles,
value: _vm.description,
"linkify-links": true
@ -27411,4 +27411,4 @@ module.exports = "data:image/svg+xml,%3csvg%20xmlns=%27http://www.w3.org/2000/sv
/***/ })
}]);
//# sourceMappingURL=calendar-src_views_Calendar_vue-data_image_svg_xml_3csvg_20xmlns_27http_www_w3_org_2000_svg_27_20heigh-4a4254.js.map?v=2cfe366ffc76e23c8b93
//# sourceMappingURL=calendar-src_views_Calendar_vue-data_image_svg_xml_3csvg_20xmlns_27http_www_w3_org_2000_svg_27_20heigh-4a4254.js.map?v=5307ae844eb83db74a98

2
calendar/js/calendar-src_views_Calendar_vue-data_image_svg_xml_3csvg_20xmlns_27http_www_w3_org_2000_svg_27_20heigh-4a4254.js.map
View File

File diff suppressed because one or more lines are too long

2
calendar/js/calendar-vendors-node_modules_path-browserify_index_js-node_modules_nextcloud_dialogs_dist_chunks_Dial-e0595f.js.map
View File

File diff suppressed because one or more lines are too long

2
calendar/src/views/EditSidebar.vue
View File

@ -121,7 +121,7 @@
<PropertySelectArticle
class="property-description"
url="/apps/gestion/ajaxGetProduits"
url="/apps/gestion/ajaxGetProduits?orderDirection=ASC"
:is-read-only="isReadOnly"
:prop-model="rfcProps.articles"
:value="description"

2
calendar/src/views/EditSimple.vue
View File

@ -139,7 +139,7 @@
<PropertySelectArticle
:is-read-only="isReadOnlyOrViewing"
url="/apps/gestion/ajaxGetProduits"
url="/apps/gestion/ajaxGetProduits?orderDirection=ASC"
:prop-model="rfcProps.articles"
:value="description"
:linkify-links="true"

7
gestion/lib/Controller/PageController.php
View File

@ -1425,8 +1425,11 @@ class PageController extends Controller {
* @NoAdminRequired
* @NoCSRFRequired
*/
public function ajaxGetProduits() {
return $this->myDb->getProduits($this->idNextcloud);
public function ajaxGetProduits($orderDirection = null) {
if($orderDirection == null){
$orderDirection = 'DESC';
}
return $this->myDb->getProduits($this->idNextcloud,$orderDirection);
}
/**

4
gestion/lib/Db/Bdd.php
View File

@ -427,9 +427,9 @@ class Bdd {
return $this->execSQL($sql, array($numfacture));
}
public function getProduits($idNextcloud){
public function getProduits($idNextcloud,$orderDirection = 'DESC'){
$sql = "SELECT *
FROM ".$this->tableprefix."produit ORDER BY id DESC;";
FROM ".$this->tableprefix."produit ORDER BY id ". $orderDirection. ";";
return $this->execSQL($sql, array());
}