Project

General

Profile

« Previous | Next » 

Revision 76974b6f

Added by Benjamin Dauvergne almost 12 years ago

agenda/actes/dossiers: move Occurence fields into Event, add recurring events support

View differences:

calebasse/fixtures/tests/test_agenda.json
105 105 
        1,
106 106 
        2
107 107 
      ],
108 
      "room": 2
108 
      "room": 2,
109 
      "create_date": "2012-10-20T11:30:00",
110 
      "start_datetime": "2012-10-30T11:30:00",
111 
      "end_datetime": "2012-10-30T12:00:00"
109 112 
    }
110 113 
  },
111 114 
  {
......
121 124 
      "services": [
122 125 
        1
123 126 
      ],
124 
      "room": 1
127 
      "room": 1,
128 
      "create_date": "2012-10-20T11:30:00",
129 
      "start_datetime": "2012-10-30T10:45:00",
130 
      "end_datetime": "2012-10-30T11:30:00"
125 131 
    }
126 132 
  },
127 133 
  {
......
137 143 
      "services": [
138 144 
        1
139 145 
      ],
140 
      "room": 2
146 
      "room": 2,
147 
      "create_date": "2012-10-20T11:30:00",
148 
      "start_datetime": "2012-10-30T10:00:00",
149 
      "end_datetime": "2012-10-30T10:45:00"
141 150 
    }
142 151 
  },
143 152 
  {
144 
    "pk": 1,
145 
    "model": "agenda.occurrence",
146 
    "fields": {
147 
      "notes": [],
148 
      "start_time": "2012-10-30T10:00:00",
149 
      "end_time": "2012-10-30T10:45:00",
150 
      "event": 1
151 
    }
153 
      "fields": {
154 
          "act_type": 97,
155 
          "patient": 10,
156 
          "event_ptr": 1
157 
      },
158 
      "model": "agenda.eventwithact",
159 
      "pk": 1
152 160 
  },
153 161 
  {
154 
    "pk": 2,
155 
    "model": "agenda.occurrence",
156 
    "fields": {
157 
      "notes": [],
158 
      "start_time": "2012-10-30T10:45:00",
159 
      "end_time": "2012-10-30T11:30:00",
160 
      "event": 2
161 
    }
162 
  },
163 
  {
164 
    "pk": 3,
165 
    "model": "agenda.occurrence",
166 
    "fields": {
167 
      "notes": [],
168 
      "start_time": "2012-10-30T11:30:00",
169 
      "end_time": "2012-10-30T12:00:00",
170 
      "event": 3
171 
    }
162 
      "fields": {
163 
          "act_type": 10,
164 
          "patient": 9,
165 
          "event_ptr": 2
166 
      },
167 
      "model": "agenda.eventwithact",
168 
      "pk": 2
172 169 
  }
173 170 
]

Also available in: Unified diff