onja
/
bodacc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

fix: feedback

node10
Ubuntu 9 months ago
parent
5ca1cd9852
commit
a510d411c9
7 changed files with 5707 additions and 3045 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8534
      package-lock.json
  2. 2
      package.json
  3. 16
      public/js/main.min.js.LICENSE.txt
  4. 8
      src/models/file.js
  5. 54
      src/routes/index.js
  6. 3
      src/services/file.js
  7. 131
      src/views/pages/index.hbs

8534
package-lock.json
View File

File diff suppressed because it is too large

2
package.json
View File

@ -39,7 +39,7 @@
"css-loader": "^6.8.1", "css-loader": "^6.8.1",
"css-minimizer-webpack-plugin": "^5.0.1", "css-minimizer-webpack-plugin": "^5.0.1",
"mini-css-extract-plugin": "^2.7.6", "mini-css-extract-plugin": "^2.7.6",
"node-sass": "^4.9.4", "node-sass": "^9.0.0",
"nodemon": "^3.0.1", "nodemon": "^3.0.1",
"sass-loader": "^13.3.2", "sass-loader": "^13.3.2",
"webpack": "^5.88.2", "webpack": "^5.88.2",

16
public/js/main.min.js.LICENSE.txt
View File

@ -0,0 +1,16 @@
/*!
* Bootstrap v5.3.2 (https://getbootstrap.com/)
* Copyright 2011-2023 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
*/
/*!
* jQuery JavaScript Library v3.7.1
* https://jquery.com/
*
* Copyright OpenJS Foundation and other contributors
* Released under the MIT license
* https://jquery.org/license
*
* Date: 2023-08-28T13:37Z
*/

8
src/models/file.js
View File

@ -188,7 +188,13 @@ class File {
columnsIndex[key].exist = headers.includes(columnsIndex[key].main); columnsIndex[key].exist = headers.includes(columnsIndex[key].main);
if ( columnsIndex[key].exist ) { if ( columnsIndex[key].exist ) {
columnsFiltered.push(columnsIndex[key].value); columnsFiltered.push(columnsIndex[key].value);
result.push(columnsIndex[key].last); if(columnsIndex[key].main ==='listeprecedentexploitant'){
result.push(`Prec Exp ${columnsIndex[key].last}`)
}else if(columnsIndex[key].main ==='listeprecedentproprietaire'){
result.push(`Prec Prop ${columnsIndex[key].last}`)
}else{
result.push(columnsIndex[key].last);
}
} }
} }

54
src/routes/index.js
View File

@ -10,7 +10,28 @@ const fileService = new FileService();
/* GET home page. */ /* GET home page. */
router.get('/', async function(req, res, next) { router.get('/', async function(req, res, next) {
fileService.checkLastOperationDate(); fileService.checkLastOperationDate();
let initialSelectedColumns = [
"region_code",
"region_nom_officiel",
"numerodepartement",
"departement_nom_officiel",
"cp",
"listepersonnes.personne.typePersonne",
"listepersonnes.personne.formeJuridique",
"listepersonnes.personne.denomination",
"listepersonnes.personne.numeroImmatriculation.codeRCS",
"listepersonnes.personne.numeroImmatriculation.numeroIdentification",
"listepersonnes.personne.nom",
"listepersonnes.personne.nomCommercial",
"listepersonnes.personne.prenom",
"listeetablissements.etablissement.activite",
"listeetablissements.etablissement.adresse.complGeographique",
"listeetablissements.etablissement.adresse.ville",
"acte.dateCommencementActivite",
"acte.vente.publiciteLegale.date",
"acte.descriptif",
"acte.vente.categorieVente",
];
res.setHeader('Content-Type', 'text/html; charset=utf-8'); res.setHeader('Content-Type', 'text/html; charset=utf-8');
const data = { const data = {
@ -75,28 +96,7 @@ router.get('/', async function(req, res, next) {
'parutionavisprecedent.numeroParution', 'parutionavisprecedent.numeroParution',
'parutionavisprecedent.numeroAnnonce', 'parutionavisprecedent.numeroAnnonce',
], ],
selected: [ selected: initialSelectedColumns,
'region_code',
'region_nom_officiel',
'numerodepartement',
'departement_nom_officiel',
'cp',
'listepersonnes.personne.typePersonne',
'listepersonnes.personne.formeJuridique',
'listepersonnes.personne.denomination',
'listepersonnes.personne.numeroImmatriculation.codeRCS',
'listepersonnes.personne.numeroImmatriculation.numeroIdentification',
'listepersonnes.personne.nom',
'listepersonnes.personne.nomCommercial',
'listepersonnes.personne.prenom',
'listeetablissements.etablissement.activite',
'listeetablissements.etablissement.adresse.complGeographique',
'listeetablissements.etablissement.adresse.ville',
'acte.dateCommencementActivite',
'acte.vente.publiciteLegale.date',
'acte.descriptif',
'acte.vente.categorieVente',
]
} }
} }
}; };
@ -133,4 +133,12 @@ router.post('/', function(req, res, next) {
}); });
}); });
// Logic to handle the drag and drop update
router.post("/update-columns-order", async function (req, res, next) {
let newColumnsOrder = req.body.columnsOrder;
data.form.columns.selected = newColumnsOrder;
// Handle saving the new column order to a database or file if necessary
res.send("Columns order updated successfully");
});
module.exports = router; module.exports = router;

3
src/services/file.js
View File

@ -24,7 +24,8 @@ class FileService {
emitter.emit('parseFromUrl.error', { url, columns, error: 'Invalid columns' }); emitter.emit('parseFromUrl.error', { url, columns, error: 'Invalid columns' });
return Promise.reject(new Error('Invalid columns')); return Promise.reject(new Error('Invalid columns'));
} }
const directoryPath = path.join(basedir, 'public/csv');
if(!fs.existsSync(directoryPath)) fs.mkdirSync(directoryPath);
// Create a new File instance // Create a new File instance
const file = new File(url); const file = new File(url);
const filepath = await file.download(); const filepath = await file.download();

131
src/views/pages/index.hbs
View File

@ -1,75 +1,100 @@
<div id="index"> <!DOCTYPE html>
<div class="container"> <html lang="en">
<head>
<meta charset="UTF-8">
<title>Génération CSV</title>
<!-- Include jQuery -->
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
<!-- Include jQuery UI -->
<script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.js"></script>
<!-- Include custom CSS -->
</head>
<body>
<div id="index">
<div class="container">
<div class="px-4 py-5 my-5 text-center"> <div class="px-4 py-5 my-5 text-center">
<h1 class="display-5 fw-bold text-body-emphasis">Génération CSV</h1> <h1 class="display-5 fw-bold text-body-emphasis">Génération CSV</h1>
<p class="lead mb-4">Génération de fichier CSV depuis une URL pointant vers un fichier de bodacc</p> <p class="lead mb-4">Génération de fichier CSV depuis une URL pointant vers un fichier de bodacc</p>
</div> </div>
<div class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="row">
<div class="col-12"> <div class="col-12">
<form method="post" action="/" id="form-download"> <form method="post" action="/" id="form-download">
<div class="form-group mb-3"> <div class="form-group mb-3">
<img src="/img/help.jpg" alt="help" class="img-fluid img-thumbnail" /> <img src="/img/help.jpg" alt="help" class="img-fluid img-thumbnail" />
</div> </div>
<hr /> <hr />
<div class="form-group mt-3"> <div class="form-group mt-3">
<label for="name" class="form-label">URL</label> <label for="name" class="form-label">URL</label>
<textarea class="form-control" id="form__url" name="url" rows="5">{{form.url.value}}</textarea> <textarea class="form-control" id="form__url" name="url" rows="5">{{form.url.value}}</textarea>
<div class="form-text"> <div class="form-text">
Inserer dans le champs ci-dessus l'url du fichier CSV bodacc à télécharger Inserer dans le champs ci-dessus l'url du fichier CSV bodacc à télécharger
</div>
</div> </div>
</div> <div class="row my-5">
<div class="row my-5"> <div class="col-12 col-md-6">
<div class="col-12 col-md-6"> <div class="form-group form__column column-choices">
<div class="form-group form__column column-choices"> <label for="name" class="column-choices__title">Colonnes disponibles</label>
<label for="name" class="column-choices__title">Colonnes disponibles</label> <ul id="form__choices" class="column-choices__list">
<ul id="form__choices" class="column-choices__list"> {{#each form.columns.options}}
{{#each form.columns.options}}
<li class="form__choice column-choice" data-value="{{this}}"> <li class="form__choice column-choice" data-value="{{this}}">
<label class="column-choice__inner"> <label class="column-choice__inner">
<input type="checkbox" name="columns[]" value="{{this}}" class="column-choice__input" /> <input type="checkbox" name="columns[]" value="{{this}}" class="column-choice__input" />
<span class="column-choice__text">{{this}}</span> <span class="column-choice__text">{{this}}</span>
</label> </label>
</li> </li>
{{/each}} {{/each}}
</ul> </ul>
</div>
</div> </div>
</div> <div class="col-12 col-md-6">
<div class="col-12 col-md-6"> <div class="form-group form__column column-choices">
<div class="form-group form__column column-choices"> <label for="name" class="column-choices__title column-choices__title--green">Colonnes
<label for="name" class="column-choices__title column-choices__title--green">Colonnes exportées</label> exportées</label>
<ul id="form__selected" class="column-choices__list"> <ul id="form__selected" class="column-choices__list">
{{#each form.columns.selected}} {{#each form.columns.selected}}
<li class="form__choice column-choice" data-value="{{this}}"> <li class="form__choice column-choice" data-value="{{this}}">
<label class="column-choice__inner"> <label class="column-choice__inner">
<input type="checkbox" name="columns[]" value="{{this}}" class="column-choice__input" checked="checked" /> <input type="checkbox" name="columns[]" value="{{this}}" class="column-choice__input"
checked="checked" />
<span class="column-choice__text">{{this}}</span> <span class="column-choice__text">{{this}}</span>
</label> </label>
</li> </li>
{{/each}} {{/each}}
</ul> </ul>
</div>
</div>
</div>
<hr />
<div class="d-flex justify-content-center">
<div class="spinner-border text-primary d-none" role="status" id="form__spinner" style="">
<span class="visually-hidden">Loading...</span>
</div> </div>
</div> </div>
</div> <div class="d-none my-3" id="form__result">
<hr /> <strong>Lien vers le fichier généré : </strong>
<div class="d-flex justify-content-center"> <a href="" target="_blank" download></a>
<div class="spinner-border text-primary d-none" role="status" id="form__spinner" style=""> </div>
<span class="visually-hidden">Loading...</span> <div class="d-grid gap-2 col-12 col-md-4 mx-auto my-3">
<button class="btn btn-primary" id="form__submit" type="submit">Télécharger</button>
</div> </div>
</div> </form>
<div class="d-none my-3" id="form__result"> </div>
<strong>Lien vers le fichier généré : </strong>
<a href="" target="_blank" download></a>
</div>
<div class="d-grid gap-2 col-12 col-md-4 mx-auto my-3">
<button class="btn btn-primary" id="form__submit" type="submit">Télécharger</button>
</div>
</form>
</div> </div>
</div> </div>
<!-- /.container-fluid -->
</div> </div>
<!-- /.container-fluid -->
</div> </div>
</div> <!-- Script pour le fonctionnement de drag and drop et AJAX -->
<script>
$(document).ready(function () {
$("#form__selected").sortable({
revert: false,
helper: "clone"
});
});
</script>
</body>
</html>
Write Preview
Loading…
Cancel
Save