diff --git a/data/xml/CreNum_header_liste_personnes.xml b/data/xml/CreNum_header_liste_personnes.xml
index 6d15f52598d1effc54ef5e298139b0e6baa2527c..50c9a8e95c2e518c5329d6fc6a70ec5559aba5a6 100644
--- a/data/xml/CreNum_header_liste_personnes.xml
+++ b/data/xml/CreNum_header_liste_personnes.xml
@@ -1633,7 +1633,7 @@
<idno type="Wikidata">https://www.wikidata.org/wiki/Q235392</idno>
<birth when="0393"/>
<death when="0448"/>
- <occupation>Roi des Francs saliens</occupation>
+ <occupation from="0428" to="0448">Roi des Francs saliens</occupation>
</person>
<person xml:id="clodomir" sex="M">
<note/>
@@ -1712,13 +1712,13 @@
</person>
<person xml:id="marcomir" sex="M">
<note/>
- <persName type="normalise">Marconir</persName>
+ <persName type="normalise">Marcomir</persName>
<idno type="VIAF">https://viaf.org/viaf/121788518/</idno>
<idno type="Biblissima"/>
<idno type="Wikidata">https://www.wikidata.org/wiki/Q371744</idno>
<birth when="0300-01-01">IVe siècle</birth>
<death when="0392">circa 400</death>
- <occupation from="0380" to="0400">Roi des Francs à la fin du IVe siècle</occupation>
+ <occupation from="0380" to="0400">Roi des Francs</occupation>
</person>
<person xml:id="merovee_1" sex="M">
<note/>
@@ -1764,14 +1764,13 @@
<occupation>Roi des Francs à Cambrai</occupation>
</person>
<person xml:id="sunnon" sex="M">
- <note/>
+ <note>Chef franc</note>
<persName type="normalise">Sunnon</persName>
<idno type="VIAF">http://viaf.org/viaf/164336467</idno>
<idno type="Biblissima"/>
<idno type="Wikidata">https://www.wikidata.org/wiki/Q1396545</idno>
<birth when="0300-01-01">circa 350</birth>
<death when="0400"/>
- <occupation from="0380" to="0400">Roi franc</occupation>
</person>
<person xml:id="theodebert_1" sex="M">
<note/>
@@ -1867,7 +1866,7 @@
<birth when="0570-04-08"/>
<death when="0596-03"/>
<occupation from="0592" to="0596">Roi des Francs de Paris</occupation>
- <occupation from="0575" to="0596">Roi des Frans d'Austrasie</occupation>
+ <occupation from="0575" to="0596">Roi des Francs d'Austrasie</occupation>
<occupation from="0593" to="0596">Roi des Francs de Bourgogne</occupation>
</person>
<person xml:id="childesinde" sex="F">
diff --git a/static/js/timeline.js b/static/js/timeline.js
index 154d46a9b82a7b023c0f188d885b8f912258052d..06ef3df85a3ea28bbca28c94187dd308e0b758a0 100644
--- a/static/js/timeline.js
+++ b/static/js/timeline.js
@@ -5,12 +5,10 @@ let handler = {
groups: new vis.DataSet(),
titlesGroup: [
"Roi de France",
- "Roi des Francs à la fin du IVe siècle",
"Roi des Francs"
],
titlesList: [
"Roi de France",
- "Roi des Francs à la fin du IVe siècle",
"Roi des Francs",
"Roi des Francs saliens",
"Roi des Francs de Metz",
@@ -34,6 +32,7 @@ let handler = {
return date;
},
init: function() {
+
// initiate titlesId ("reignName": groupId)
titleCnt = 1;
for(var i = 0; i < handler.titlesList.length; i++){
@@ -46,6 +45,7 @@ let handler = {
}
}
+ // add groups
handler.groups.add({
id: 1,
content: "Roi de France / Roi des Francs",
@@ -68,7 +68,7 @@ let handler = {
var kingNb = 0;
for (var i = 0; i < reigns.length; i++) {
- var listInfosReign = Object();
+
// on retire le reigne courant de la copie de la liste
handler.copyListReigns = handler.copyListReigns.slice(1);
var reignId = reigns[i]["id"];
@@ -85,16 +85,17 @@ let handler = {
var id = i + 1;
var content = reigns[i]["name"];
+ var title = reigns[i]["title"];
+ var groupId = handler.titlesId[title];
- // vérifier si pas un doublons de reigne, si oui alors mettre les
- // noms des deux rois ensembles dans le même champs
+ // vérifier si pas un doublons de reigne, si oui alors l'indiquer
var severalReigns = false;
for (var copyReign in handler.copyListReigns) {
- copyName = handler.copyListReigns[copyReign]["name"];
- copyTitle = handler.copyListReigns[copyReign]["title"];
- copyStart = handler.copyListReigns[copyReign]["start"];
- copyEnd = handler.copyListReigns[copyReign]["end"];
- if (start == copyStart && end == copyEnd && reigns[i]["title"] == copyTitle) {
+ var copyTitle = handler.copyListReigns[copyReign]["title"];
+ var copyGroupId = handler.titlesId[copyTitle];
+ var copyStart = handler.copyListReigns[copyReign]["start"];
+ var copyEnd = handler.copyListReigns[copyReign]["end"];
+ if (start == copyStart && end == copyEnd && groupId == copyGroupId) {
severalReigns = true;
}
}
@@ -105,35 +106,27 @@ let handler = {
}
kingNb = handler.kingsList.findIndex((element) => element == content)+1;
- for (var j = 0; j < handler.titlesList.length; j++) {
- var groupId = handler.titlesId[handler.titlesList[j]];
- if (reigns[i]["title"] == handler.titlesList[j]) {
- if (severalReigns) {
- handler.items.add({
- id: id,
- content: content,
- start: start,
- end: end,
- // type: 'background',
- group: groupId,
- subgroup: "severalReigns",
- className: 'king' + kingNb
- });
- } else {
-
- handler.items.add({
- id: id,
- content: content,
- start: start,
- end: end,
- // type: 'background',
- group: groupId,
- subgroup: "oneReign",
- className: 'king' + kingNb
- });
- }
- break;
- }
+ // add items
+ if (severalReigns) {
+ handler.items.add({
+ id: id,
+ content: content,
+ start: start,
+ end: end,
+ group: groupId,
+ subgroup: "severalReigns",
+ className: 'king' + kingNb
+ });
+ } else {
+ handler.items.add({
+ id: id,
+ content: content,
+ start: start,
+ end: end,
+ group: groupId,
+ subgroup: "oneReign",
+ className: 'king' + kingNb
+ });
}
}
}
diff --git a/static/json/list_persons.json b/static/json/list_persons.json
index a8fb94e20356bec7fcda5391a4111a06e6d2ec8b..a577451bfef8348ad75445965955fc80b225da13 100644
--- a/static/json/list_persons.json
+++ b/static/json/list_persons.json
@@ -1 +1 @@
-[{"id":"caribert_1","name":"Caribert Ier"},{"id":"basine","name":"Basine"},{"id":"charlemagne","name":"Charlemagne"},{"id":"childebert_1","name":"Childebert Ier"},{"id":"childeric_1","name":"Childéric Ier"},{"id":"clodion","name":"Clodion le Chevelu"},{"id":"clodomir","name":"Clodomir"},{"id":"clotaire_1","name":"Clotaire Ier"},{"id":"clotilde","name":"Clotilde"},{"id":"clovis_1","name":"Clovis Ier"},{"id":"francois_1","name":"François Ier"},{"id":"gontran","name":"Gontran"},{"id":"louis_12","name":"Louis XII"},{"id":"marcomir","name":"Marconir"},{"id":"merovee_1","name":"Mérovée Ier"},{"id":"pepin_le_bref","name":"Pépin le Bref"},{"id":"pharamond","name":"Pharamond"},{"id":"ragnacaire","name":"Ragnacaire"},{"id":"sunnon","name":"Sunnon"},{"id":"theodebert_1","name":"Théodebert Ier"},{"id":"theodebald","name":"Théodebald"},{"id":"theodebald_2","name":"Théodebald"},{"id":"thierry_1","name":"Thierry Ier"},{"id":"athanagilde_1","name":"Athanagilde Ier"},{"id":"audovere","name":"Audovère"},{"id":"austregilde","name":"Austregilde"},{"id":"brunehaut","name":"Brunehaut"},{"id":"childebert_2","name":"Childebert II "},{"id":"childesinde","name":"Childesinde"},{"id":"chilperic_1","name":"ChilpeÌric Ier"},{"id":"chunsene","name":"Chunsène"},{"id":"clotaire_2","name":"Clotaire II"},{"id":"clovis_fils_chilperic","name":"Clovis"},{"id":"ermenberge","name":"Ermenberge"},{"id":"fredegonde","name":"Frédégonde"},{"id":"galswinthe","name":"Galswinthe"},{"id":"goswinthe","name":"Goswinthe"},{"id":"ingeberge","name":"Ingeberge"},{"id":"ingonde_femme_clotaire","name":"Ingonde"},{"id":"ingonthe_princesse_despagne","name":"Ingonthe"},{"id":"marcova","name":"Marcova"},{"id":"meroflede","name":"Méroflède"},{"id":"merovee_2","name":"Mérovée II"},{"id":"aregonde","name":"Aregonde"},{"id":"radegonde","name":"Radegonde"},{"id":"sigebert_1","name":"Sigebert Ier"},{"id":"theodebert_2","name":"Théodebert II"},{"id":"thibert_fils_chilperic","name":"Thibert"},{"id":"thierry_2","name":"Thierry II"},{"id":"thierry_fils_chilperic","name":"Thierry"},{"id":"wiliachaire","name":"Wiliachaire"},{"id":"rigonde","name":"Rigonde"}]
\ No newline at end of file
+[{"id":"caribert_1","name":"Caribert Ier"},{"id":"basine","name":"Basine"},{"id":"charlemagne","name":"Charlemagne"},{"id":"childebert_1","name":"Childebert Ier"},{"id":"childeric_1","name":"Childéric Ier"},{"id":"clodion","name":"Clodion le Chevelu"},{"id":"clodomir","name":"Clodomir"},{"id":"clotaire_1","name":"Clotaire Ier"},{"id":"clotilde","name":"Clotilde"},{"id":"clovis_1","name":"Clovis Ier"},{"id":"francois_1","name":"François Ier"},{"id":"gontran","name":"Gontran"},{"id":"louis_12","name":"Louis XII"},{"id":"marcomir","name":"Marcomir"},{"id":"merovee_1","name":"Mérovée Ier"},{"id":"pepin_le_bref","name":"Pépin le Bref"},{"id":"pharamond","name":"Pharamond"},{"id":"ragnacaire","name":"Ragnacaire"},{"id":"sunnon","name":"Sunnon"},{"id":"theodebert_1","name":"Théodebert Ier"},{"id":"theodebald","name":"Théodebald"},{"id":"theodebald_2","name":"Théodebald"},{"id":"thierry_1","name":"Thierry Ier"},{"id":"athanagilde_1","name":"Athanagilde Ier"},{"id":"audovere","name":"Audovère"},{"id":"austregilde","name":"Austregilde"},{"id":"brunehaut","name":"Brunehaut"},{"id":"childebert_2","name":"Childebert II "},{"id":"childesinde","name":"Childesinde"},{"id":"chilperic_1","name":"ChilpeÌric Ier"},{"id":"chunsene","name":"Chunsène"},{"id":"clotaire_2","name":"Clotaire II"},{"id":"clovis_fils_chilperic","name":"Clovis"},{"id":"ermenberge","name":"Ermenberge"},{"id":"fredegonde","name":"Frédégonde"},{"id":"galswinthe","name":"Galswinthe"},{"id":"goswinthe","name":"Goswinthe"},{"id":"ingeberge","name":"Ingeberge"},{"id":"ingonde_femme_clotaire","name":"Ingonde"},{"id":"ingonthe_princesse_despagne","name":"Ingonthe"},{"id":"marcova","name":"Marcova"},{"id":"meroflede","name":"Méroflède"},{"id":"merovee_2","name":"Mérovée II"},{"id":"aregonde","name":"Aregonde"},{"id":"radegonde","name":"Radegonde"},{"id":"sigebert_1","name":"Sigebert Ier"},{"id":"theodebert_2","name":"Théodebert II"},{"id":"thibert_fils_chilperic","name":"Thibert"},{"id":"thierry_2","name":"Thierry II"},{"id":"thierry_fils_chilperic","name":"Thierry"},{"id":"wiliachaire","name":"Wiliachaire"},{"id":"rigonde","name":"Rigonde"}]
\ No newline at end of file
diff --git a/static/json/list_reigns.json b/static/json/list_reigns.json
index 9b4a69581086b77a8c3c105018d548a3485e70a2..f5823538fca2c7172ad6f1819001fb4009174b50 100644
--- a/static/json/list_reigns.json
+++ b/static/json/list_reigns.json
@@ -1 +1 @@
-[{"id":"1-1","title":"Roi des Francs à la fin du IVe siècle","name":"Marconir","start":"0380-01-01","end":"0400-01-01"},{"id":"2-1","title":"Roi franc","name":"Sunnon","start":"0380-01-01","end":"0400-01-01"},{"id":"4-1","title":"Roi des Francs saliens","name":"Mérovée Ier","start":"0451-01-01","end":"0457-01-01"},{"id":"5-1","title":"Roi des Francs saliens","name":"Childéric Ier","start":"0457-01-01","end":"0481-01-01"},{"id":"6-1","title":"Roi des Francs","name":"Clovis Ier","start":"0481-01-01","end":"0511-01-01"},{"id":"7-1","title":"Roi des Francs de Metz","name":"Thierry Ier","start":"0511-01-01","end":"0534-01-01"},{"id":"8-1","title":"Roi des Francs de Paris","name":"Childebert Ier","start":"0511-01-01","end":"0558-01-01"},{"id":"8-2","title":"Roi des Francs d'Orléans","name":"Childebert Ier","start":"0524-01-01","end":"0558-01-01"},{"id":"9-1","title":"Roi des Francs d'Orléans","name":"Clodomir","start":"0511-01-01","end":"0524-01-01"},{"id":"10-1","title":"Roi des Francs","name":"Clotaire Ier","start":"0558-01-01","end":"0561-01-01"},{"id":"10-2","title":"Roi des Francs de Soissons","name":"Clotaire Ier","start":"0511-01-01","end":"0558-01-01"},{"id":"10-3","title":"Roi des Francs d'Orléans","name":"Clotaire Ier","start":"0524-01-01","end":"0558-01-01"},{"id":"10-4","title":"Roi des Francs d'Austrasie","name":"Clotaire Ier","start":"0555-01-01","end":"0558-01-01"},{"id":"11-1","title":"Roi des Francs de Metz","name":"Théodebald","start":"0548-01-01","end":"0555-01-01"},{"id":"12-1","title":"Roi des Francs de Metz","name":"Théodebert Ier","start":"0534-01-01","end":"0548-01-01"},{"id":"13-1","title":"Roi des Francs de Paris","name":"Caribert Ier","start":"0561-01-01","end":"0567-01-01"},{"id":"14-1","title":"Roi des Francs d'Austrasie","name":"Sigebert Ier","start":"0561-01-01","end":"0575-01-01"},{"id":"15-1","title":"Roi des Francs de Bourgogne","name":"Gontran","start":"0561-01-01","end":"0593-01-01"},{"id":"16-1","title":"Roi des Francs de Neustrie","name":"ChilpeÌric Ier","start":"0561-01-01","end":"0584-01-01"},{"id":"17-1","title":"Roi des Francs de Paris","name":"Childebert II","start":"0592-01-01","end":"0596-01-01"},{"id":"17-2","title":"Roi des Frans d'Austrasie","name":"Childebert II","start":"0575-01-01","end":"0596-01-01"},{"id":"17-3","title":"Roi des Francs de Bourgogne","name":"Childebert II","start":"0593-01-01","end":"0596-01-01"},{"id":"18-1","title":"Roi des Francs d'Austrasie","name":"Théodebert II","start":"0596-01-01","end":"0612-01-01"},{"id":"19-1","title":"Roi des Francs de Bourgogne","name":"Thierry II","start":"0596-01-01","end":"0613-01-01"},{"id":"19-2","title":"Roi des Francs d'Austrasie","name":"Thierry II","start":"0612-01-01","end":"0613-01-01"},{"id":"20-1","title":"Roi des Francs de Neustrie","name":"Clotaire II","start":"0584-01-01","end":"0613-01-01"},{"id":"20-2","title":"Roi des Francs de Paris","name":"Clotaire II","start":"0595-01-01","end":"0613-01-01"},{"id":"20-3","title":"Roi des Francs d'Austrasie et de Bourgogne","name":"Clotaire II","start":"0613-01-01","end":"0629-01-01"},{"id":"20-4","title":"Roi des Francs","name":"Clotaire II","start":"0613-01-01","end":"0629-01-01"},{"id":"21-2","title":"Roi des Francs","name":"Pépin le Bref","start":"0751-01-01","end":"0768-01-01"},{"id":"22-1","title":"Roi des Francs","name":"Charlemagne","start":"0768-10-13","end":"0814-02-01"},{"id":"22-2","title":"Roi des Lombards","name":"Charlemagne","start":"0774-07-14","end":"0814-02-01"},{"id":"23-1","title":"Roi de France","name":"Louis XII","start":"1498-01-01","end":"1515-01-01"},{"id":"24-1","title":"Roi de France","name":"François Ier","start":"1515-01-01","end":"1547-01-01"}]
+[{"id":"1-1","title":"Roi des Francs","name":"Marcomir","start":"0380-01-01","end":"0400-01-01"},{"id":"3-1","title":"Roi des Francs saliens","name":"Clodion le Chevelu","start":"0428-01-01","end":"0448-01-01"},{"id":"4-1","title":"Roi des Francs saliens","name":"Mérovée Ier","start":"0451-01-01","end":"0457-01-01"},{"id":"5-1","title":"Roi des Francs saliens","name":"Childéric Ier","start":"0457-01-01","end":"0481-01-01"},{"id":"6-1","title":"Roi des Francs","name":"Clovis Ier","start":"0481-01-01","end":"0511-01-01"},{"id":"7-1","title":"Roi des Francs de Metz","name":"Thierry Ier","start":"0511-01-01","end":"0534-01-01"},{"id":"8-1","title":"Roi des Francs de Paris","name":"Childebert Ier","start":"0511-01-01","end":"0558-01-01"},{"id":"8-2","title":"Roi des Francs d'Orléans","name":"Childebert Ier","start":"0524-01-01","end":"0558-01-01"},{"id":"9-1","title":"Roi des Francs d'Orléans","name":"Clodomir","start":"0511-01-01","end":"0524-01-01"},{"id":"10-1","title":"Roi des Francs","name":"Clotaire Ier","start":"0558-01-01","end":"0561-01-01"},{"id":"10-2","title":"Roi des Francs de Soissons","name":"Clotaire Ier","start":"0511-01-01","end":"0558-01-01"},{"id":"10-3","title":"Roi des Francs d'Orléans","name":"Clotaire Ier","start":"0524-01-01","end":"0558-01-01"},{"id":"10-4","title":"Roi des Francs d'Austrasie","name":"Clotaire Ier","start":"0555-01-01","end":"0558-01-01"},{"id":"11-1","title":"Roi des Francs de Metz","name":"Théodebald","start":"0548-01-01","end":"0555-01-01"},{"id":"12-1","title":"Roi des Francs de Metz","name":"Théodebert Ier","start":"0534-01-01","end":"0548-01-01"},{"id":"13-1","title":"Roi des Francs de Paris","name":"Caribert Ier","start":"0561-01-01","end":"0567-01-01"},{"id":"14-1","title":"Roi des Francs d'Austrasie","name":"Sigebert Ier","start":"0561-01-01","end":"0575-01-01"},{"id":"15-1","title":"Roi des Francs de Bourgogne","name":"Gontran","start":"0561-01-01","end":"0593-01-01"},{"id":"16-1","title":"Roi des Francs de Neustrie","name":"ChilpeÌric Ier","start":"0561-01-01","end":"0584-01-01"},{"id":"17-1","title":"Roi des Francs de Paris","name":"Childebert II","start":"0592-01-01","end":"0596-01-01"},{"id":"17-2","title":"Roi des Francs d'Austrasie","name":"Childebert II","start":"0575-01-01","end":"0596-01-01"},{"id":"17-3","title":"Roi des Francs de Bourgogne","name":"Childebert II","start":"0593-01-01","end":"0596-01-01"},{"id":"18-1","title":"Roi des Francs d'Austrasie","name":"Théodebert II","start":"0596-01-01","end":"0612-01-01"},{"id":"19-1","title":"Roi des Francs de Bourgogne","name":"Thierry II","start":"0596-01-01","end":"0613-01-01"},{"id":"19-2","title":"Roi des Francs d'Austrasie","name":"Thierry II","start":"0612-01-01","end":"0613-01-01"},{"id":"20-1","title":"Roi des Francs de Neustrie","name":"Clotaire II","start":"0584-01-01","end":"0613-01-01"},{"id":"20-2","title":"Roi des Francs de Paris","name":"Clotaire II","start":"0595-01-01","end":"0613-01-01"},{"id":"20-3","title":"Roi des Francs d'Austrasie et de Bourgogne","name":"Clotaire II","start":"0613-01-01","end":"0629-01-01"},{"id":"20-4","title":"Roi des Francs","name":"Clotaire II","start":"0613-01-01","end":"0629-01-01"},{"id":"21-2","title":"Roi des Francs","name":"Pépin le Bref","start":"0751-01-01","end":"0768-01-01"},{"id":"22-1","title":"Roi des Francs","name":"Charlemagne","start":"0768-10-13","end":"0814-02-01"},{"id":"22-2","title":"Roi des Lombards","name":"Charlemagne","start":"0774-07-14","end":"0814-02-01"},{"id":"23-1","title":"Roi de France","name":"Louis XII","start":"1498-01-01","end":"1515-01-01"},{"id":"24-1","title":"Roi de France","name":"François Ier","start":"1515-01-01","end":"1547-01-01"}]
\ No newline at end of file
diff --git a/templates/timeline.html.j2 b/templates/timeline.html.j2
index 26825ed985fc5016dee16fc8cb800d3d0e4add02..9d51b7405632644a23faf937a6c1f0ce881fdaa1 100644
--- a/templates/timeline.html.j2
+++ b/templates/timeline.html.j2
@@ -12,10 +12,10 @@
<div class="row">
<div class="col" id="instructions">
- <p>Pour manipuler la frise chornologique :</p>
+ <p>Pour manipuler la frise chronologique :</p>
<ul>
- <li>Utiliser la roulette à l'intérieur du cadre pour zoomer-dézoomer.</li>
- <li>Maintenir appuyé dans le cadre déplaçant la souris permet de se déplacer dans la frise.</li>
+ <li>Pour zoomer-dézoomer, utiliser la roulette à l'intérieur du cadre.</li>
+ <li>Pour se déplacer dans la frise, maintenir appuyé dans le cadre et déplacer la souris.</li>
</ul>
</div>
</div>