# HG changeset patch # User veltr # Date 1343125856 -7200 # Node ID 2448fdcef6562b349db519cf871cddfa7d544207 # Parent f8b1d6f5bb33fc52833f35f6afcad212966b3380 Added Narrative Occurrence Support diff -r f8b1d6f5bb33 -r 2448fdcef656 timeline/data/api_occurrence_narrative.json --- a/timeline/data/api_occurrence_narrative.json Fri Jul 20 16:37:23 2012 +0200 +++ b/timeline/data/api_occurrence_narrative.json Tue Jul 24 12:30:56 2012 +0200 @@ -1,1 +1,135 @@ -[{"date":"","dependanceNarrative":["2"],"idOccurrenceNarrative":"1","titre":"Occurrence Narrtive 1","accroche":"L'accroche de l'occurrence narrative","description":"Description de l'occurrence narrative. Description de l'occurrence narrative. Description de l'occurrence narrative. Description de l'occurrence narrative. ","idUnivers":"1","idInformation":"3","jour":"","heure":"","dateEcheanceDisponibilite":"1343117700","verrouille":"","dateCreation":"1341919313","dateModification":"1342093147","statut":"A r\u00e9aliser","jourEcheanceDisponibilite":"1","heureEcheanceDisponibilite":"10:15:00","commentaire":"Associ\u00e9 \u00e0 une occurrence narrative\r\nDoit \u00eatre faite au plus t\u00f4t","tags":"Anarchy test","JT":"0","nomUnivers":"Saint-Germain"},{"date":"","dependanceNarrative":"","idOccurrenceNarrative":"2","titre":"Titre test ON","accroche":"Accroche test Occurrence narrative","description":"Accroche test Occurrence narrative, accroche test Occurrence narrative, accroche test Occurrence narrative,accroche test Occurrence narrative,accroche test Occurrence narrative.","idUnivers":"5","idInformation":"","jour":"","heure":"","dateEcheanceDisponibilite":"","verrouille":"","dateCreation":"","dateModification":"","statut":"","jourEcheanceDisponibilite":"","heureEcheanceDisponibilite":"","commentaire":"","tags":"","JT":"0","nomUnivers":"Le gouvernement d'Union Nationale"}] \ No newline at end of file +[ + { + "date": "1343253600", + "dependanceNarrative": ["2"], + "idOccurrenceNarrative": "1", + "titre": "Occurrence Narrtive 1", + "accroche": "

L'accroche de l'occurrence narrative<\/p>", + "description": "Description de l'occurrence narrative. Description de l'occurrence narrative. Description de l'occurrence narrative. Description de l'occurrence narrative. ", + "idUnivers": "1", + "idInformation": "3", + "jour": "3", + "heure": "00:00:00", + "dateEcheanceDisponibilite": "1343117700", + "verrouille": "", + "dateCreation": "-62169987600", + "dateModification": "-62169987600", + "statut": "A r\u00e9aliser", + "jourEcheanceDisponibilite": "1", + "heureEcheanceDisponibilite": "10:15:00", + "commentaire": "Associ\u00e9 \u00e0 une occurrence narrative\nDoit \u00eatre faite au plus t\u00f4t", + "tags": "Anarchy test", + "JT": "0", + "nomUnivers": "Saint-Germain" + }, { + "date": "", + "dependanceNarrative": "", + "idOccurrenceNarrative": "2", + "titre": "Titre test ON", + "accroche": "Accroche test Occurrence narrative", + "description": "Accroche test Occurrence narrative, accroche test Occurrence narrative, accroche test Occurrence narrative,accroche test Occurrence narrative,accroche test Occurrence narrative.", + "idUnivers": "5", + "idInformation": "", + "jour": "", + "heure": "", + "dateEcheanceDisponibilite": "", + "verrouille": "", + "dateCreation": "", + "dateModification": "", + "statut": "", + "jourEcheanceDisponibilite": "", + "heureEcheanceDisponibilite": "", + "commentaire": "", + "tags": "", + "JT": "0", + "nomUnivers": "Le gouvernement d'Union Nationale" + }, { + "date": "1343559000", + "dependanceNarrative": "", + "idOccurrenceNarrative": "3", + "titre": "", + "accroche": "", + "description": "", + "idUnivers": "4", + "idInformation": "84", + "jour": "6", + "heure": "12:50:00", + "dateEcheanceDisponibilite": "1342994400", + "verrouille": "", + "dateCreation": "-62169987600", + "dateModification": "1343119867", + "statut": "A valider", + "jourEcheanceDisponibilite": "0", + "heureEcheanceDisponibilite": "00:00:00", + "commentaire": "", + "tags": "", + "JT": "0", + "nomUnivers": "Carcassone" + }, { + "date": "1343473440", + "dependanceNarrative": "", + "idOccurrenceNarrative": "4", + "titre": "", + "accroche": "", + "description": "", + "idUnivers": "3", + "idInformation": "85", + "jour": "5", + "heure": "13:04:00", + "dateEcheanceDisponibilite": "1342994400", + "verrouille": "", + "dateCreation": "-62169987600", + "dateModification": "1343119867", + "statut": "A valider", + "jourEcheanceDisponibilite": "0", + "heureEcheanceDisponibilite": "00:00:00", + "commentaire": "", + "tags": "", + "JT": "0", + "nomUnivers": "La cit\u00e9" + }, { + "date": "1343532240", + "dependanceNarrative": "", + "idOccurrenceNarrative": "5", + "titre": "Nouveau titre de test", + "accroche": "", + "description": "", + "idUnivers": "4", + "idInformation": "86", + "jour": "6", + "heure": "05:24:00", + "dateEcheanceDisponibilite": "1342994400", + "verrouille": "", + "dateCreation": "-62169987600", + "dateModification": "1343119867", + "statut": "A valider", + "jourEcheanceDisponibilite": "0", + "heureEcheanceDisponibilite": "00:00:00", + "commentaire": "", + "tags": "", + "JT": "0", + "nomUnivers": "Carcassone" + }, { + "date": "1343541720", + "dependanceNarrative": "", + "idOccurrenceNarrative": "6", + "titre": "", + "accroche": "", + "description": "", + "idUnivers": "4", + "idInformation": "88", + "jour": "6", + "heure": "08:02:00", + "dateEcheanceDisponibilite": "1342994400", + "verrouille": "", + "dateCreation": "-62169987600", + "dateModification": "1343119867", + "statut": "A valider", + "jourEcheanceDisponibilite": "0", + "heureEcheanceDisponibilite": "00:00:00", + "commentaire": "", + "tags": "", + "JT": "0", + "nomUnivers": "Carcassone" + } +] \ No newline at end of file diff -r f8b1d6f5bb33 -r 2448fdcef656 timeline/data/api_occurrence_publication.json --- a/timeline/data/api_occurrence_publication.json Fri Jul 20 16:37:23 2012 +0200 +++ b/timeline/data/api_occurrence_publication.json Tue Jul 24 12:30:56 2012 +0200 @@ -1,1 +1,1655 @@ -[{"nomUnivers":"","datePublication":"1343380140","dateDepublication":"1343426400","dependanceNarrative":"","dependancePublication":["53"],"imageUri":"medias\/images\/manuelvalls.jpg","imageTitre":"","idOccurrencePublication":"14","titre":"Les policiers n'auront pas de cong\u00e9s jusqu'\u00e0 nouvel ordre","accroche":"

Pas de repos pour les fonctionnaires de police, pas de permission pour les gendarmes...<\/span><\/p>","contenu":"

Les forces de l'ordre veilleront \u00e0 la s\u00e9curit\u00e9 de chacun. Nous avons rappel\u00e9 tous les gendarmes et tous les policiers. Ils n'auront pas de cong\u00e9s jusqu'\u00e0 nouvel ordre. Le calme continuera de r\u00e9gner dans toutes les r\u00e9gions de France\" annonce Manuel Valls, ministre de l'int\u00e9rieur.\u00a0<\/p>","typeOccurrencePublication":"Article","idInformation":"12","image":"7","idUnivers":"0","publication":"En ligne","jourPublication":"4","heurePublication":"11:09:00","jourDepublication":"5","heureDepublication":"00:00:00","typeMedia":"Web,Mobile","estHot":"1","idUser":"0","dateEcheanceDisponibilite":"1342994400","verrouille":"","dateCreation":"-62169987600","dateModification":"-62169987600","statut":"Valid\u00e9e","jourEcheanceDisponibilite":"0","heureEcheanceDisponibilite":"00:00:00","commentaire":"","tags":"","JT":"0"},{"nomUnivers":"","datePublication":"1343115060","dateDepublication":"","dependanceNarrative":"","dependancePublication":"","imageUri":"medias\/images\/marinelepen.jpg","imageTitre":"","idOccurrencePublication":"15","titre":"Cafouillage au sein du gouvernement","accroche":"

Quatre à six semaines selon les experts, deux semaines selon le gouvernement. Combien de temps le pays devra tenir avant l’introduction d’une nouvelle monnaie ?<\/em><\/p>","contenu":"

Selon les experts interrogés par l’AFP, il faudrait “quatre à six semaines pour approvisionner les guichets”, un délai qui contredit les informations du gouvernement qui s’est fixé “deux semaines” pour la mise en circulation de la nouvelle monnaie.<\/p>\n

Laurent Pinsolle, un anti-euro convaincu depuis longtemps, revient sur l’intérêt de revenir à une monnaie nationale et se réjouit de la décision du gouvernement.<\/p>\n