Merge branch 'features/feature-autocomplete-on-select' into staging

This commit is contained in:
Tiavina 2025-01-27 10:36:27 +03:00
commit 979acb2132
28 changed files with 66 additions and 31 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -6,6 +6,9 @@
"": {
"name": "gestion",
"license": "agpl",
"dependencies": {
"select2": "^4.1.0-rc.0"
},
"devDependencies": {
"@nextcloud/browserslist-config": "^2.3.0",
"@nextcloud/dialogs": ">=3.1.2",
@ -4025,6 +4028,11 @@
"url": "https://opencollective.com/webpack"
}
},
"node_modules/select2": {
"version": "4.1.0-rc.0",
"resolved": "https://registry.npmjs.org/select2/-/select2-4.1.0-rc.0.tgz",
"integrity": "sha512-Hr9TdhyHCZUtwznEH2CBf7967mEM0idtJ5nMtjvk3Up5tPukOLXbHUNmh10oRfeNIhj+3GD3niu+g6sVK+gK0A=="
},
"node_modules/semver": {
"version": "7.3.8",
"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",

View File

@ -55,5 +55,8 @@
},
"browserslist": [
"extends @nextcloud/browserslist-config"
]
],
"dependencies": {
"select2": "^4.1.0-rc.0"
}
}

View File

@ -62,3 +62,27 @@ table.dataTable.display tbody tr.odd > [class*="sorting_"] {
table.dataTable.display tbody tr.even > [class*="sorting_"] {
background-color: var(--color-main-background);
}
.select2-container--default .select2-selection--single {
background-color: #fff !important;
border: 2px solid var(--color-border-maxcontrast) !important;
border-radius: 8px !important;
height: 36px !important;
padding: 2px 4px 2px 4px !important;
}
.select2-container--default .select2-selection--single .select2-selection__rendered {
color: black !important;
}
.select2-container--default .select2-selection--single .select2-selection__arrow {
height: 26px !important;
right: 10px !important;
top: 6px !important;
width: 20px !important;
}
.select2-container--default .select2-selection--single .select2-selection__arrow b {
border-color: black rgba(0, 0, 0, 0) rgba(0, 0, 0, 0) rgba(0, 0, 0, 0) !important;
margin-top: -4px !important;
}

View File

@ -5,11 +5,14 @@ import "../css/mycss.css";
import { globalConfiguration } from "./modules/mainFunction.mjs";
import "./listener/main_listener";
import { exportClientDevisByMonthAndYearToPdf } from "./modules/ajaxRequest.mjs";
import 'select2/dist/css/select2.css';
import 'select2';
import '../css/mycss.css';
window.addEventListener("DOMContentLoaded", function () {
globalConfiguration();
$('#clientselector').select2();
const urlParams = new URLSearchParams(window.location.search);
const clientId = urlParams.get('cli');
const year = urlParams.get('annee');

View File

@ -7,15 +7,13 @@ import "./listener/main_listener";
import "./listener/invoiceListener";
import { getPDF } from "./pdf";
import { saveDocumentRecap } from "./modules/ajaxRequest.mjs";
import 'select2/dist/css/select2.css';
import 'select2';
window.addEventListener("DOMContentLoaded", function () {
globalConfiguration();
// var pdf = document.getElementById("pdfFactures");
// pdf.addEventListener("click",async ()=>{
// getPDF('facture');
// });
$('#clientselector').select2();
var documentRecap = document.getElementById("documentrecap");
documentRecap.addEventListener("click", async ()=> {
const urlParams = new URLSearchParams(window.location.search);

View File

@ -2,7 +2,6 @@ import {showError, showSuccess } from "@nextcloud/dialogs";
import {baseUrl} from "../modules/mainFunction.mjs";
import { Devis } from "../objects/devis.mjs";
import DataTable from "datatables.net";
window.addEventListener("DOMContentLoaded", function () {
const today = new Date();