Project

General

Profile

« Previous | Next » 

Revision c8d74e1a

Added by Jérôme Schneider over 12 years ago

Fix #1869 agenda: add default event types

Improve new event (event type selecy) : pre-select "Reunion" and
remove vancances and rendez-vous

Load new fixtures :
python manage.py loaddata agenda

View differences:

calebasse/fixtures/agenda.json
1 1 
[
2 
  {
3 
    "pk": 4,
4 
    "model": "agenda.eventtype",
5 
    "fields": {
6 
      "label": "R\u00e9union \u00e0 l'ext\u00e9rieur"
7 
    }
8 
  },
9 
  {
10 
    "pk": 5,
11 
    "model": "agenda.eventtype",
12 
    "fields": {
13 
      "label": "En formation"
14 
    }
15 
  },
16 
  {
17 
    "pk": 6,
18 
    "model": "agenda.eventtype",
19 
    "fields": {
20 
      "label": "Donne  une formation"
21 
    }
22 
  },
23 
  {
24 
    "pk": 7,
25 
    "model": "agenda.eventtype",
26 
    "fields": {
27 
      "label": "Equipe pluridisciplinaire MLA"
28 
    }
29 
  },
30 
  {
31 
    "pk": 8,
32 
    "model": "agenda.eventtype",
33 
    "fields": {
34 
      "label": "Supervision"
35 
    }
36 
  },
37 
  {
38 
    "pk": 9,
39 
    "model": "agenda.eventtype",
40 
    "fields": {
41 
      "label": "R\u00e9union de service"
42 
    }
43 
  },
44 
  {
45 
    "pk": 10,
46 
    "model": "agenda.eventtype",
47 
    "fields": {
48 
      "label": "R\u00e9union de direction"
49 
    }
50 
  },
51 
  {
52 
    "pk": 11,
53 
    "model": "agenda.eventtype",
54 
    "fields": {
55 
      "label": "R\u00e9union administratifs"
56 
    }
57 
  },
58 
  {
59 
    "pk": 12,
60 
    "model": "agenda.eventtype",
61 
    "fields": {
62 
      "label": "R\u00e9union agents de service"
63 
    }
64 
  },
65 
  {
66 
    "pk": 13,
67 
    "model": "agenda.eventtype",
68 
    "fields": {
69 
      "label": "Concertation direction"
70 
    }
71 
  },
72 
  {
73 
    "pk": 14,
74 
    "model": "agenda.eventtype",
75 
    "fields": {
76 
      "label": "P\u00e9rinatalit\u00e9"
77 
    }
78 
  },
79 
  {
80 
    "pk": 15,
81 
    "model": "agenda.eventtype",
82 
    "fields": {
83 
      "label": "R\u00e9union des parents"
84 
    }
85 
  },
86 
  {
87 
    "pk": 16,
88 
    "model": "agenda.eventtype",
89 
    "fields": {
90 
      "label": "Temps de trajet"
91 
    }
92 
  },
2 93 
  {
3 94 
    "pk": 3,
4 95 
    "model": "agenda.event",
5 96 
    "fields": {
6 
      "room": 2,
7 97 
      "event_type": 2,
98 
      "title": "Reunion",
99 
      "description": "Bla bla bla",
100 
      "participants": [
101 
        5,
102 
        6
103 
      ],
8 104 
      "services": [
9 105 
        1,
10 106 
        2
11 107 
      ],
12 
      "participants": [
13 
          5,
14 
          6
15 
      ],
16 
      "description": "Bla bla bla",
17 
      "title": "Reunion"
108 
      "room": 2
18 109 
    }
19 110 
  },
20 111 
  {
21 112 
    "pk": 2,
22 113 
    "model": "agenda.event",
23 114 
    "fields": {
24 
      "room": 1,
25 115 
      "event_type": 1,
26 
      "services": [
27 
        2
28 
      ],
116 
      "title": "rdv jack",
117 
      "description": "blabla bla bla",
29 118 
      "participants": [
30 119 
        5
31 120 
      ],
32 
      "description": "blabla bla bla",
33 
      "title": "rdv jack"
121 
      "services": [
122 
        2
123 
      ],
124 
      "room": 1
34 125 
    }
35 126 
  },
36 127 
  {
37 128 
    "pk": 1,
38 129 
    "model": "agenda.event",
39 130 
    "fields": {
40 
      "room": 1,
41 131 
      "event_type": 1,
42 
      "services": [
43 
        1
44 
      ],
132 
      "title": "rdv john doe",
133 
      "description": "blabla",
45 134 
      "participants": [
46 135 
        5
47 136 
      ],
48 
      "description": "blabla",
49 
      "title": "rdv john doe"
137 
      "services": [
138 
        1
139 
      ],
140 
      "room": 2
50 141 
    }
51 142 
  },
52 143 
  {
53 144 
    "pk": 1,
54 145 
    "model": "agenda.occurrence",
55 146 
    "fields": {
147 
      "notes": [],
56 148 
      "start_time": "2012-10-30T10:00:00",
57 
      "notes": [],
58 149 
      "end_time": "2012-10-30T10:45:00",
59 150 
      "event": 1
60 151 
    }
......
63 154 
    "pk": 2,
64 155 
    "model": "agenda.occurrence",
65 156 
    "fields": {
157 
      "notes": [],
66 158 
      "start_time": "2012-10-30T10:45:00",
67 
      "notes": [],
68 159 
      "end_time": "2012-10-30T11:30:00",
69 160 
      "event": 2
70 161 
    }
......
73 164 
    "pk": 3,
74 165 
    "model": "agenda.occurrence",
75 166 
    "fields": {
167 
      "notes": [],
76 168 
      "start_time": "2012-10-30T11:30:00",
77 
      "notes": [],
78 169 
      "end_time": "2012-10-30T12:00:00",
79 170 
      "event": 3
80 171 
    }

Also available in: Unified diff