Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: etalab/DVF-app
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: bda1d23d7a254aee38975587b436f4a7e7419767
Choose a base ref
..
head repository: etalab/DVF-app
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 58c0a3adbd51b7d390bfdf63e546751eaf0b9800
Choose a head ref
Showing with 9 additions and 9 deletions.
  1. +6 −6 db/build_db.sh
  2. +2 −2 static/index.html
  3. +1 −1 static/js/index.js
12 changes: 6 additions & 6 deletions db/build_db.sh
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
# Script de création de la base de donnees PostgreSQL
# Script de création de la base de donnees PostgreSQL
DIR=$(echo $(dirname $0))
cd $DIR

@@ -14,9 +14,9 @@ dvf_datasets[2020]="90a98de0-f562-4328-aa16-fe0dd1dca60f"

datasets_url="https://www.data.gouv.fr/fr/datasets/r/"

sudo -u postgres psql -c "DROP DATABASE IF EXISTS dvf_202004;"
sudo -u postgres psql -c "CREATE DATABASE dvf_202004;"
sudo -u postgres psql -c "ALTER DATABASE dvf_202004 SET datestyle TO ""ISO, DMY"";"
sudo -u postgres psql -c "DROP DATABASE IF EXISTS dvf_202010;"
sudo -u postgres psql -c "CREATE DATABASE dvf_202010;"
sudo -u postgres psql -c "ALTER DATABASE dvf_202010 SET datestyle TO ""ISO, DMY"";"
sudo -u postgres psql -d dvf_202004 -f "create_table.sql"

# Chargement des données sur le serveur
@@ -46,8 +46,8 @@ for YEAR in 2015 2016 2017 2018 2019 2020
do
mv dvf/dist/${YEAR}/full.csv.gz $DATAPATH/full_$YEAR.csv.gz
gunzip -f $DATAPATH/full_$YEAR.csv.gz
sudo -u postgres psql -d dvf_202004 -c "COPY dvf FROM '$DATAPATH/full_$YEAR.csv' delimiter ',' csv header encoding 'UTF8';"
sudo -u postgres psql -d dvf_202010 -c "COPY dvf FROM '$DATAPATH/full_$YEAR.csv' delimiter ',' csv header encoding 'UTF8';"
done

# Ajout d'une colonne et d'index - Assez long
sudo -u postgres psql -d dvf_202004 -f "alter_table.sql"
sudo -u postgres psql -d dvf_202010 -f "alter_table.sql"
4 changes: 2 additions & 2 deletions static/index.html
View file
Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@
<style type="text/css">
html, body {
height: 100vh;
overflow-y: hidden;
overflow-y: hidden;
}
</style>
</head>
@@ -145,7 +145,7 @@
<script src="js/data.js"></script>
<script src="js/component.boite.js"></script>
<script src="js/component.boite-accordeon.js"></script>
<script src="js/index.js?v=1"></script>
<script src="js/index.js?v=3"></script>

</body>

2 changes: 1 addition & 1 deletion static/js/index.js
View file
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@ vue.$watch('fold_left', function () {

// Définition des variables globales

var MIN_DATE = '2015-01-01'
var MIN_DATE = '2014-01-01'
var MAX_DATE = '2020-06-30'

var map = null;