TheCoreDev/mia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into 'main'

Browse Source 
Utilisation de mysql2 + renommage session.js

See merge request france/recherche-innovation/sud-ouest/tec/mia/partenariat_cortex/ihm!4
This commit is contained in:
LE CORRE, Laurent
2023-11-23 15:30:17 +00:00
parent 88d414ac47 4a68b5a724
commit aab46e50cb
3 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app.js
View File

@@ -1,5 +1,5 @@
const express = require('express') const express = require('express')
const mysql = require("mysql") const mysql = require("mysql2")
const dotenv = require('dotenv') const dotenv = require('dotenv')
const app = express() const app = express()
const path = require("path") const path = require("path")
@@ -30,19 +30,10 @@ db.connect((error) => {
app.set('view engine', 'hbs'); app.set('view engine', 'hbs');
app.use(express.static(publicDir)); app.use(express.static(publicDir));
app.use('/css', express.static(__dirname + '/node_modules/bootstrap/dist/css')); app.use('/css', express.static(__dirname + '/node_modules/bootstrap/dist/css'));
app.use('/css', express.static(__dirname + '/node_modules/@eonasdan/tempus-dominus/dist/css'));
app.use('/js', express.static(__dirname + '/node_modules/@eonasdan/tempus-dominus/dist/js'));
app.use(bodyParser.urlencoded({extended: false})); app.use(bodyParser.urlencoded({extended: false}));
app.use(express.json()) app.use(bodyParser.json());
async function recupListeSessions() {
let today = functions.getNowDate("yyyymmdd");
// On récupère la liste des sessions actives et pour lesquelles il reste de la place
db.query('SELECT ID, topic, DATE_FORMAT(scheduled_on, "%d/%m/%Y") as "date", DATE_FORMAT(scheduled_on, "%Hh%i") as "heure", IF(nb_of_attended-nb_of_participants=0, true, false) as "maxAtteint" FROM session WHERE DATE_FORMAT(scheduled_on, "%Y%m%d") >= ?', [today], async (error, result) => {
if(error){ console.log(error); }
return result;
});
}
// ******************************************* Arrivée sur la page d'accueil ******************************************* // ******************************************* Arrivée sur la page d'accueil *******************************************

2
public/scripts-session.js → public/session.js
View File

@@ -1,8 +1,8 @@
// DatePicker sur l'écran de création d'une session // DatePicker sur l'écran de création d'une session
window.datetimepicker1 = $('#datetimepicker1'); window.datetimepicker1 = $('#datetimepicker1');
datetimepicker1.tempusDominus({ datetimepicker1.tempusDominus({
//put your config here
allowInputToggle: true, allowInputToggle: true,
stepping: 15, stepping: 15,
localization: { localization: {

2
views/create-session.hbs
View File

@@ -13,7 +13,7 @@
<script src="https://cdn.jsdelivr.net/npm/@eonasdan/tempus-dominus@6.7.10/dist/js/tempus-dominus.js"></script> <script src="https://cdn.jsdelivr.net/npm/@eonasdan/tempus-dominus@6.7.10/dist/js/tempus-dominus.js"></script>
<script src="https://cdn.jsdelivr.net/npm/@eonasdan/tempus-dominus@6.7.10/dist/js/jQuery-provider.js"></script> <script src="https://cdn.jsdelivr.net/npm/@eonasdan/tempus-dominus@6.7.10/dist/js/jQuery-provider.js"></script>
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@eonasdan/tempus-dominus@6.7.10/dist/css/tempus-dominus.css" /> <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@eonasdan/tempus-dominus@6.7.10/dist/css/tempus-dominus.css" />
<script type="module" src="/scripts-session.js"></script> <script type="module" src="/session.js"></script>
</head> </head>
</head> </head>
<body> <body>