Commit Graph

57 Commits

Author SHA1 Message Date
Johnson Chetty
63ed1f9674 atlas imports, ugly try excepts, but the data imports 2012-02-02 22:07:06 +01:00
Sanj
0df365164a break out of loop if route lookup fails 2012-02-02 19:28:02 +05:30
Sanj
f3ca42d303 er, ups, just .name 2012-02-02 19:23:08 +05:30
Sanj
013db9d625 stop.name 2012-02-02 19:22:03 +05:30
Sanj
487cce26c8 er, silly, again, field names 2012-02-02 19:19:02 +05:30
Sanj
246af58b6e routedetails field changes, silly 2012-02-02 19:17:26 +05:30
Sanj
499229e30e RouteDetails -> RouteDetail 2012-02-02 19:15:58 +05:30
Sanj
91a25d1f5b edit import_atlas to use Route if routeMapping.json does not contain mapping 2012-02-02 19:09:29 +05:30
Sanj
0e37c60b34 changes merged from johnson 2012-02-02 18:00:06 +05:30
Johnson Chetty
36927d3fee data_mapper.fire_up sucessfully loads up data 2012-02-02 13:12:25 +01:00
Sanj
c8369d1b34 added json files needed for atlas import + edited atlas import for new field names 2012-02-02 01:12:32 +05:30
Johnson Chetty
fd93e3c708 data mapper under progress 2 2012-02-01 16:04:31 +05:30
Johnson Chetty
0402e18a64 data mapper under progress 2012-02-01 15:42:50 +05:30
Johnson Chetty
35b93df6c1 changes made to imports folder 2012-02-01 03:39:11 +05:30
Johnson Chetty
385c9620d5 data_mapper in progress 2012-01-29 12:24:37 +05:30
Johnson Chetty
d221910572 index.html tweak 2012-01-22 08:43:19 +05:30
Johnson Chetty
2cc38475fd index.html tweak for bgcolor 2012-01-22 08:33:10 +05:30
Johnson Chetty
78741aca7b Changes made to home page and started work on data_mapper, models file tweaked a bit to allow nulls in marathi fields 2012-01-22 08:18:50 +05:30
Sanj
013af6003a merged 2012-01-11 19:56:50 +05:30
Sanj
a73ecd726d minor 2012-01-11 19:54:05 +05:30
ChaloBEST server
ebf882c454 resolved conflicts 2012-01-11 14:56:23 +01:00
Sanj
b00a1945bf some usable data in db 2012-01-11 05:16:17 +05:30
Sanj
895ab5de04 added comments to import_atlas, but it is still wrong :( 2012-01-11 04:32:38 +05:30
Sanj
eae4d52bec atlas import, almost there 2012-01-11 02:30:55 +05:30
Sanj
032f350ac2 added fuzzy wuzzy to requirements 2012-01-02 18:16:38 +05:30
Sanj
86928205c1 schema for atlas import added to models.py 2012-01-02 16:50:51 +05:30
Sanj
00d51e0d78 merged, fixed image in template 2011-12-29 19:14:29 +05:30
Johnson Chetty
2917178fcf changes made to db structure.. and to admin.py 2011-12-28 01:21:20 +05:30
Johnson Chetty
ed0ab33e8a index page is up. pretty much stable , db table added from rev13, settings.py from rev12 2011-12-28 00:35:50 +05:30
Sanj
43d96beadc merged admin, again over-rode branch's chalobest.db (hopefully) 2011-12-23 17:48:17 +05:30
Sanj
7c0c233f53 added grappelli to requirements; put back chalobest.db from rev 13 2011-12-23 17:44:48 +05:30
Johnson Chetty
f9292b28a5 admin config show added tables 2011-12-23 13:19:17 +05:30
Johnson Chetty
913fbef643 scary merge part 2 2011-12-23 04:30:15 +05:30
Johnson Chetty
8378c5dfa7 scary merge 2011-12-23 04:28:47 +05:30
Sanj
ffc3d7e1bb added errors folder 2011-12-23 04:04:20 +05:30
Johnson Chetty
748a6616f4 data loaded for schedule, marathi names for stops, area, Depot and Holiday tables. 2011-12-23 04:03:52 +05:30
Sanj
64c6e58f46 minor, cleanup unused function 2011-12-23 03:39:49 +05:30
Sanj
d57cdf0720 get atlas json to grouped by unique routes with rows for schedule days, final state to split into 3 tables and import into db 2011-12-23 03:36:30 +05:30
Sanj
3575a65912 more static cruft 2011-12-21 17:25:24 +05:30
Sanj
64577069a0 index page cruft 2011-12-21 17:22:26 +05:30
Sanj
689df93f8a added subroute models 2011-12-16 19:59:06 +05:30
Sanj
56ee058e83 conflicts resolved 2011-12-16 17:58:10 +05:30
Johnson Chetty
bf1a803f93 resolving conflicts in chalobest.db accepted theirs. 2011-12-16 17:54:15 +05:30
Johnson Chetty
ace61256ab removed chalobest.db from tree 2011-12-16 17:50:12 +05:30
Johnson Chetty
3d0c79f68c a little better admin interface and cleaner code 2011-12-16 17:48:17 +05:30
Sanj
5cfb0a3b82 admin media path in settings + local_settings 2011-12-15 18:32:17 +05:30
Sanj
55c7b3a717 path to sqlite db shud be absolute 2011-12-15 18:29:44 +05:30
Sanj
e28ab92ba2 edit requirements.txt 2011-12-15 17:51:14 +05:30
Sanj
3b3d544c9a silly, whitespace 2011-12-15 17:44:54 +05:30
Sanj
e6e14014ac added atlas csvs; script to get atlas.json 2011-12-14 05:37:21 +05:30