temporary branch

This commit is contained in:
BACHIR SOULDI
2024-10-17 11:30:20 +01:00
parent cd115a234b
commit 742ec3e75e
212 changed files with 18396 additions and 1899 deletions

View File

@@ -8,9 +8,9 @@
# ~~~~~
db.default.driver = org.postgresql.Driver
db.default.ddl = update
db.default.url = jdbc:postgresql://localhost:5432/bdd_sophal
db.default.url = jdbc:postgresql://localhost:5432/bdd_live2
db.default.user = postgres
db.default.password = root
db.default.password = Ijlv=bB^hSG@PV$,9jkhHzO*74
# Application Information
# ~~~~~
@@ -96,7 +96,7 @@ file.upload.dir = {java.io.tmpdir}/axelor
# Maximum upload size (in MB)
# ~~~~~
file.upload.size = 5
file.upload.size = 30
# Indicate if the birt engine to use is the embedded engine or external engine
# Default : true
@@ -131,17 +131,19 @@ hibernate.search.default.indexBase = {java.io.tmpdir}/axelor
# HikariCP connection pool
# ~~~~~
hibernate.hikari.minimumIdle = 5
hibernate.hikari.maximumPoolSize = 20
hibernate.hikari.maximumPoolSize = 25
hibernate.hikari.idleTimeout = 300000
# CORS configuration to allow cross origin requests
# ~~~~~
# regular expression to test allowed origin or * to allow all (not recommended)
#cors.allow.origin = *
#cors.allow.credentials = true
#cors.allow.methods = GET,PUT,POST,DELETE,HEAD,OPTIONS
#cors.allow.headers = Origin,Accept,X-Requested-With,Content-Type,Access-Control-Request-Method,Access-Control-Request-Headers
# regular expression to test allowed origin or * to allow all (not recommended)
# cors.allow.origin = *
# cors.allow.credentials = true
# cors.allow.methods = GET,PUT,POST,DELETE,HEAD,OPTIONS
# cors.allow.headers = Origin,Accept,X-Requested-With,Content-Type,Access-Control-Request-Method,Access-Control-Request-Headers
# cors.expose.headers =
# cors.max.age = 1728000
# Logging
# ~~~~~
# Custom logback configuration can be provided with `logging.config` property pointing
@@ -185,12 +187,14 @@ logging.level.com.axelor = DEBUG
# Quartz scheduler
# ~~~~~
#quartz.enable = true
#quartz.threadCount = 5
quartz.enable = false
# quartz.threadCount = 5
# Allows to open maximum 10 Tabs
view.tabs.max = 10
view.collaboration.enabled = true
# The external report design directory
# ~~~~~

View File

@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<object-views xmlns="http://axelor.com/xml/ns/object-views"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://axelor.com/xml/ns/object-views https://axelor.com/xml/ns/object-views/object-views_6.1.xsd">
<dashboard name="welcome.dashboard" title="Welcome!">
<dashlet action="custom:report-tasks-today" colSpan="4"/>
</dashboard>
<action-view name="welcome" title="Welcome!">
<view type="dashboard" name="welcome.dashboard"/>
</action-view>
<menuitem name="menu-dashboards" order="-101"
title="Dashboards" icon="fa-dashboard" icon-background="blue"/>
<menuitem name="menu-welcome" parent="menu-dashboards"
title="Welcome!" action="welcome"/>
</object-views>

View File

@@ -0,0 +1,47 @@
<script>
$(document).on("click",".fa-check", function () {
console.log("ok");
$(this).parent().parent().parent().removeClass("hilite-info-text");
$(this).parent().parent().parent().removeClass("hilite-warning-text");
$(this).parent().parent().parent().addClass("hilite-success-text");
$(this).parent().parent().siblings(".l11").text("Accepté")
});
$(document).on("click", ".fa-times", function () {
$(this).parent().parent().parent().removeClass("hilite-info-text");
$(this).parent().parent().parent().removeClass("hilite-success-text");
$(this).parent().parent().parent().addClass("hilite-warning-text");
$(this).parent().parent().siblings(".l11").text("Refusée")
});
var html5QrcodeScanner = null;
$(document).on("click","[name='scan']",function(){
console.log("clicked");
document.getElementsByName("scanPlaceHolder")[0].innerHTML = '<div id="qr-reader" style="width: 600px"></div>'
var html5QrcodeScanner = new Html5QrcodeScanner(
"qr-reader", { fps: 10, qrbox: 250 });
html5QrcodeScanner.render(onScanSuccess,onScanError);
})
function onScanSuccess(decodedText, decodedResult) {
// $("[name='rack'] input").val(decodedText);
// var scope = angular.element(document.querySelector("[name='product'] input")).scope()
// $("[name='product'] input").val(decodedText);
console.log(document.querySelector("[name='productHolder']"));
angular.element(document.querySelector('[name="productHolder"]')).scope().setValue(decodedText,true);
html5QrcodeScanner.clear();
}
function onScanError(errorMessage) {
console.log(errorMessage);
// handle on error condition, with error message
}
</script>

View File

@@ -0,0 +1,12 @@
<style>
[name="scanPlaceHolder"] {
width: 100%;
height: 100%;
overflow: hidden;
display: flex;
justify-content: center;
align-items: center;
}
</style>
<script src="https://unpkg.com/html5-qrcode" type="text/javascript"></script>
<script src="https://code.jquery.com/jquery-3.6.2.min.js" integrity="sha256-2krYZKh//PcchRtd+H+VyyQoZ/e3EcrkxhM8ycwASPA=" crossorigin="anonymous"></script>