# HG changeset patch # User Madhusudan.C.S # Date 1249801791 -19800 # Node ID 0c9bdcfac9f70f27c0cbd7639ae79f82115efc0b # Parent 05b9e60e6a10e2f39c7b4c72cbc2d405f4abc84b Added all data diff -r 05b9e60e6a10 -r 0c9bdcfac9f7 app/projrev/models.py --- a/app/projrev/models.py Sat Aug 08 23:54:36 2009 +0530 +++ b/app/projrev/models.py Sun Aug 09 12:39:51 2009 +0530 @@ -16,33 +16,659 @@ """Model class for NME funded projects. """ - LINE_ITEM_CHOICES = [('ME', 'Mechanical'), - ('CE', 'Chemical'), - ('EE', 'Electrical'), - ('AE', 'Aero Space'), - ('CS', 'Computer Science'), - ('IT', 'Information Technology'), - ] + LINE_ITEM_CHOICES = { + "NP": "NPTEL phase II / III", + "PG": "PG Classes", + "UG": "UG Classes", + "VC": "Video content digitization, conversion, chunking and dubbing CEC / IGNOU / NCERT / SIET / OTHERS", + "PE": "Provision of e-books and e-journals free to the learners", + "SQ": "Standardisation of quality assurance of contents & certification / automation of certification", + "DS": "Developing suitable pedagogical methods for various classes, intellectual calibers and research in e-learning", + "DL": "Development of language converter and translation tool kit", + "DR": "Development and realization of Virtual Reality Laboratories and supporting facilities for e-learning", + "DC": "Development of Certification & Testing Modules for Virtual Technological Universities & creation of VTU, multi media research and international programmes", + "ED": "Experimentation and Development of ultra low cost access devices for wider coverage of learners & their field trials", + "TT": "Talk to a teacher to provide a substitute for coaching for the economically poor students", + "DH": "Development of software controlled hardware programming for robotics other crucial areas", + "AD": "Adaptation & deployment of open source simulation packages equivalent to MATLAB, ORCAD etc.", + "DU": "Development of unified ERP system for Educational Institutions", + "PT": "Publicity & training of motivators & trainers to ensure full utilization of the systems by institutions & students. Teacher Empowerment 'B'", + "CC": "Conversion of available content in various regional languages", + "DV": "Development of Vocational Educational modules and use of haptic devices for education & training", + } + + STATE_CHOICES = { + "DN": "Dadra and Nagar Haveli", + "DL": "Delhi", + "WB": "West Bengal", + "HR": "Haryana", + "HP": "Himachal Pradesh", + "UP": "Uttar Pradesh", + "JH": "Jharkhand", + "BR": "Bihar", + "JK": "Jammu & Kashmir", + "TN": "Tamil Nadu", + "LD": "Lakshadweep", + "NL": "Nagaland", + "PY": "Pondicherry", + "TR": "Tripura", + "PB": "Punjab", + "DD": "Daman & Diu", + "RJ": "Rajasthan", + "CH": "Chandigarh", + "CG": "Chattisgarh", + "AN": "Andaman & Nicobar", + "AP": "Andhra Pradesh", + "AS": "Assam", + "AR": "Arunachal Pradesh", + "GA": "Goa", + "GJ": "Gujarat", + "KA": "Karnataka", + "UA": "Uttarakhand", + "ML": "Meghalaya", + "MN": "Manipur", + "MH": "Maharashtra", + "KL": "Kerala", + "SK": "Sikkim", + "MP": "Madhya Pradesh", + "OR": "Orissa", + "MZ": "Mizoram" + } - STATE_CHOICES = [('MH', 'Maharashtra'), - ('KA', 'Karnataka'), - ('KL', 'Kerala'), - ('TN', 'Tamil Nadu'), - ('AP', 'Andra Pradesh'), - ] - - DISTRICT_CHOICES = [('AD', 'Adilabad'), - ('RT', 'Ratnagiri'), - ('MU', 'Mumbai suburban'), - ('PU', 'Pune'), - ('PL', 'Palakkad'), - ('BN', 'Bangalore Urban district'), - ('CK', 'Chikmagalur District'), - ] + DISTRICT_CHOICES = { + "JHES": "Purba Singhbhum", + "TNRA": "Ramanathapuram", + "PBAM": "Amritsar", + "ORMY": "Mayurbhanj", + "UPMG": "Maharajganj", + "ORML": "Malkangiri", + "MZAI": "Aizawl", + "NLKO": "Kohima", + "PBFR": "Faridkot", + "ARPA": "Papum Pare", + "SKES": "East Sikkim", + "UAPI": "Pithoragharh", + "MHNS": "Nashik", + "PBFI": "Firozpur", + "KAKD": "Kodagu", + "APRA": "Rangareddi", + "BRSO": "Sheohar", + "UPSV": "Shravasti", + "KAKL": "Kolar District", + "PYPO": "Puducherry", + "UPSU": "Sultanpur", + "UPSR": "Sant Ravidas Nagar", + "MHRT": "Ratnagiri", + "UPSN": "Siddharthnagar", + "PBHO": "Hoshiarpur", + "UPSJ": "Shahjahanpur", + "KAKP": "Koppal District", + "UPSI": "Sitapur", + "BRSP": "Sheikhpura", + "BRSR": "Saran", + "BRSU": "Supaul", + "BRST": "Sitamarhi", + "BRSW": "Siwan", + "UPSA": "Saharanpur", + "KADH": "Dharwad District", + "JHLO": "Lohardaga", + "ASSO": "Sonitpur", + "KADK": "Dakshina Kannada", + "ASSI": "Sibsagar", + "KADA": "Davanagere District", + "ORJP": "Jajapur (Jajpur)", + "ORJS": "Jagatsinghpur", + "UPMP": "Mainpuri", + "MHBU": "Buldhana", + "TNKR": "Karur", + "WBME": "Midnapore", + "UPUN": "Unnao", + "TNKC": "Kanchipuram", + "SKSS": "South Sikkim", + "MPUM": "Umaria", + "JKJA": "Jammu", + "MPUJ": "Ujjain", + "CGMA": "Mahasamund", + "GJPA": "Patan", + "UACL": "Chamoli", + "PYMA": "Mahe", + "GJPO": "Porbandar", + "GJPM": "Panchmahal", + "RJHA": "Hanumangarh", + "WBDD": "Dakshin Dinajpur", + "WBDA": "Darjeeling", + "HPUN": "Una", + "PBFT": "Fatehgarh Sahib", + "MHLA": "Latur", + "GJVD": "Vadodara", + "UPLK": "Lakhimpur Kheri", + "JHBO": "Bokaro", + "HRHI": "Hissar", + "WBJA": "Jalpaiguri", + "UPDE": "Deoria", + "MPRE": "Rewa", + "MPRG": "Rajgarh", + "MPRL": "Ratlam", + "ASLA": "Lakhimpur", + "MPRS": "Raisen", + "HPMA": "Mandi", + "PBMU": "Mukatsar", + "BRPA": "Patna", + "BRRO": "Rohtas", + "PBMA": "Mansa", + "BRPU": "Purnia", + "PBMO": "Moga", + "RJSR": "Sirohi", + "MHAH": "Ahmednagar", + "MHAK": "Akola", + "MHAM": "Amrawati", + "HRSN": "Sonepat", + "MHAU": "Aurangabad", + "ARTI": "Tirap", + "PBBA": "Bathinda", + "RJSK": "Sikar", + "KAUD": "Udupi District", + "RJSM": "Sawai Madhopur", + "RJAJ": "Ajmer", + "APVZ": "Vizianagaram", + "RJAL": "Alwar", + "MHWR": "Wardha", + "MHWS": "Washim", + "APVS": "Vishakhapatnam", + "KAHV": "Haveri District", + "KAHS": "Hassan District", + "MPGW": "Gwalior", + "MPGU": "Guna", + "JHPK": "Pakur", + "JHPL": "Palamu", + "UPEW": "Etawah", + "UPKU": "Kushinagar", + "UPKS": "Kaushambi", + "BRSH": "Saharsa", + "UPKD": "Kanpur Dehat", + "PBPA": "Patiala", + "UPKN": "Kanpur Nagar", + "BRSM": "Samastipur", + "UPVA": "Varanasi", + "UPKJ": "Kannauj", + "APCH": "Chittoor", + "HRRE": "Rewari", + "NLZU": "Zunheboto", + "BRBU": "Buxar", + "HRRO": "Rohtak", + "TNCH": "Chennai", + "BRBJ": "Bhojpur", + "UATG": "Tehri Garhwal", + "BRBG": "Bhagalpur", + "BRBE": "Begusarai", + "BRBA": "Banka", + "MHHI": "Hingoli", + "UPJP": "Jyotiba Phule Nagar", + "GJBR": "Bharuch", + "GJBV": "Bhavnagar", + "GJBK": "Banaskantha", + "TRST": "South Tripura", + "GANG": "North Goa", + "ORPU": "Puri", + "KACK": "Chikballapur District", + "UPSO": "Sonbhadra", + "HRMW": "Mewat", + "RJTO": "Tonk", + "NLDI": "Dimapur", + "HRMA": "Mahendragarh", + "UPSK": "Sant Kabir Nagar", + "MZCH": "Champhai", + "BRLA": "Lakhisarai", + "UPJH": "Jhansi", + "ARAJ": "Anjaw", + "UAUS": "Udham Singh Nagar", + "UPRB": "Rae Bareli", + "UAUT": "Uttarkashi", + "ASTI": "Tinsukia", + "KLKL": "Kollam", + "KLKN": "Kannur", + "KLKS": "Kasaragod", + "KLKT": "Kottayam", + "KLKZ": "Kozhikode", + "MHBI": "Beed", + "MPHA": "Harda", + "MHBH": "Bhandara", + "MHST": "Satara", + "MPHO": "Hoshangabad", + "MHSN": "Sangli", + "MHSO": "Solapur", + "ASBA": "Barpeta", + "KASH": "Shimoga District", + "MHSI": "Sindhudurg", + "ASBO": "Bongaigaon", + "MZLU": "Lunglei", + "MPCT": "Chhatarpur", + "BRKI": "Kishanganj", + "BRKH": "Khagaria", + "HPSO": "Solan", + "KLTV": "Thiruvananthapuram", + "BRKM": "Kaimur", + "HPSH": "Shimla", + "KLTS": "Thrissur", + "MNCC": "Churachandpur", + "ORBH": "Bhadrak", + "MZLA": "Lawngtlai", + "BRKT": "Katihar", + "ORJH": "Jharsuguda", + "MPCN": "Chhindwara", + "APCU": "Kadapa", + "ORBD": "Boudh (Bauda)", + "PYKA": "Karaikal", + "UPGZ": "Ghaziabad", + "UPGR": "Gorkakhpur", + "UPGP": "Ghazipur", + "GASG": "South Goa", + "JHCH": "Chatra", + "MHOS": "Osmanabad", + "UPGN": "Gonda", + "GJAH": "Ahmedabad", + "WBNA": "Nadia", + "GJAM": "Amreli District", + "GJAN": "Anand", + "JKBR": "Baramula", + "APGU": "Guntur", + "ASMA": "Marigaon", + "JKBD": "Badgam", + "WBUD": "Uttar Dinajpur", + "TNSI": "Sivagangai", + "TNSA": "Salem", + "MHDH": "Dhule", + "PBNS": "Nawan Shehar", + "PBGU": "Gurdaspur", + "ARWK": "West Kameng", + "RJPA": "Pali", + "UPAG": "Agra", + "WBBI": "Birbhum", + "RJPG": "Pratapgarh", + "JKPO": "Poonch", + "KLPL": "Palakkad", + "APPR": "Prakasam", + "KLPT": "Pathanamthitta", + "TNAY": "Ariyalur", + "JKPU": "Pulwama", + "RJBW": "Bhilwara", + "RJBN": "Banswara", + "AREL": "Lohit", + "RJBM": "Barmer", + "AREK": "East Kameng", + "RJBI": "Bikaner", + "ORCU": "Cuttack", + "RJBU": "Bundi", + "RJBR": "Baran", + "KLWA": "Wayanad", + "RJBP": "Bharatpur", + "MHYA": "Yavatmal", + "ORAN": "Angul", + "UPAU": "Auraiya", + "WBMA": "Malda", + "MPTI": "Tikamgarh", + "GJSN": "Surendranagar", + "APNE": "Nellore", + "GJSK": "Sabarkantha", + "APNI": "Nizamabad", + "DLSW": "South West Delhi", + "BRGA": "Gaya", + "DLSD": "South Delhi", + "GJST": "Surat", + "UPBD": "Badaun", + "ORSO": "Subarnapur (Sonepur)", + "JHGI": "Giridih", + "JHGO": "Godda", + "WBHR": "Howrah", + "TNTJ": "Thanjavur", + "TNTK": "Thoothukudi", + "JHGA": "Garhwa", + "TNTI": "Tirunelveli", + "TNTL": "Thiruvallur", + "ORSA": "Sambalpur", + "KLER": "Ernakulam", + "TNKK": "Kanyakumari", + "TNTP": "Tiruppur", + "TNTV": "Tiruvannamalai", + "WBMU": "Murshidabad", + "MHKO": "Kolhapur", + "ORSU": "Sundargarh (Sundergarh)", + "UPBG": "Bagpat", + "JHGU": "Gumla", + "SKNS": "North Sikkim", + "RJUD": "Udaipur", + "TRDH": "Dhalai", + "MLEG": "East Garo Hills", + "UPCD": "Chandauli", + "HRJH": "Jhajjar", + "HRJI": "Jind", + "MLSG": "South Garo Hills", + "DLCD": "Central Delhi", + "UPCT": "Chitrakoot", + "MNUK": "Ukhrul", + "DLED": "East Delhi", + "PBJA": "Jalandhar", + "CGRN": "Rajnandgaon", + "PYYA": "Yanam", + "KABG": "Belgaum District", + "KABD": "Bidar District", + "KABJ": "Bijapur District", + "KABK": "Bagalkot District", + "CGRG": "Raigarh", + "KABN": "Bangalore Urban district", + "KABL": "Bellary District", + "KABR": "Bangalore Rural District", + "UPPR": "Pratapgarh", + "CGRP": "Raipur", + "TNTC": "Tiruchirappalli", + "UPME": "Meerut", + "MLEK": "East Khasi Hills", + "DLWD": "West Delhi", + "UPMB": "Mau", + "UPMO": "Moradabad", + "UPMH": "Mahoba", + "KATU": "Tumkur District", + "MPKA": "Katni", + "UPMT": "Mathura", + "UPMU": "Muzaffarnagar", + "TNMA": "Madurai", + "JKLE": "Leh", + "APMA": "Mahbubnagar", + "ASCA": "Cachar", + "APME": "Medak", + "MHRG": "Raigad", + "MPBP": "Bhopal", + "MPBR": "Barwani", + "MNBI": "Bishnupur", + "GJVL": "Valsad", + "NLPH": "Phek", + "RJNA": "Nagaur", + "BRDA": "Darbhanga", + "MPBE": "Betul", + "MPBD": "Bhind", + "PBLU": "Ludhiana", + "MPBL": "Balaghat", + "MZKO": "Kolasib", + "APNA": "Nalgonda", + "HPBI": "Bilaspur", + "UPJU": "Jaunpur District", + "GJDG": "The Dangs", + "GJDA": "Dahod", + "WBHG": "Hooghly", + "NLWO": "Wokha", + "MPPA": "Panna", + "UPJL": "Jalaun", + "ASJO": "Jorhat", + "WBKO": "Kolkata", + "HPKU": "Kulu", + "HRSI": "Sirsa", + "MLJH": "Jaintia Hills", + "HPKI": "Kinnaur", + "UADD": "Dehradun", + "UACP": "Champawat", + "HPKA": "Kangra", + "TNPU": "Pudukkottai", + "JHKO": "Koderma", + "UPRA": "Rampur", + "TNPE": "Perambalur", + "HRAM": "Ambala", + "MHGO": "Gondiya", + "KLAL": "Alappuzha", + "MHGA": "Gadchiroli", + "KAMA": "Mandya District", + "BRMP": "Madhepura", + "BRMZ": "Muzaffarpur", + "BRMG": "Munger", + "JKSR": "Samba", + "BRMB": "Madhubani", + "KAMY": "Mysore District", + "RJGA": "Ganganagar", + "BRGO": "Gopalganj", + "ORDH": "Dhenkanal", + "MPEN": "Khandwa (East Nimar)", + "JHRA": "Ranchi", + "JHRM": "Ramgarh District", + "BRVA": "Vaishali", + "HPLS": "Lahaul and Spiti", + "GJKA": "Kutch", + "UARP": "Rudraprayag", + "GJKH": "Kheda", + "MPSI": "Sidhi", + "MPWN": "Khargone (West Nimar)", + "PBRU": "Rupnagar", + "MNSE": "Senapati", + "APAN": "Anantapur", + "NLTU": "Tuensang", + "CGJA": "Jashpur", + "ASGG": "Golaghat", + "CGJC": "Janjgir-Champa", + "APAD": "Adilabad", + "RJJW": "Jhalawar", + "UPMI": "Mirzapur", + "RJJS": "Jaisalmer", + "RJJP": "Jaipur", + "ASGP": "Goalpara", + "RJJL": "Jalore", + "RJJJ": "Juhnjhunun", + "HPHA": "Hamirpur", + "MPSR": "Sehore", + "TNTH": "Theni", + "MLWG": "West Garo Hills", + "CGDH": "Dhamtari", + "MHND": "Nanded", + "MHNG": "Nagpur", + "MLWK": "West Khasi Hills", + "CGDA": "Dantewada", + "HRFT": "Fatehabad", + "CGDU": "Durg", + "HRFR": "Faridabad", + "TNTR": "Thiruvarur", + "UPFI": "Firozabad", + "JKAN": "Anantnag", + "UPFT": "Fatehpur", + "ASNL": "Nalbari", + "APKA": "Karimnagar", + "HRPP": "Panipat", + "UPFR": "Farrukhabad", + "ASNG": "Nagaon", + "ASNC": "North Cachar Hills", + "UPFZ": "Faizabad", + "MNTH": "Thoubal", + "WBPN": "North 24 Parganas", + "TRWT": "West Tripura", + "MNTA": "Tamenglong", + "PBKA": "Kapurthala", + "RJDA": "Dausa", + "WBPS": "South 24 Parganas", + "UPPI": "Pilibhit", + "KLMA": "Malappuram", + "ARCH": "Changlang", + "WBPU": "Purulia", + "MHCH": "Chandrapur", + "KACJ": "Chamarajnagar District", + "ORKN": "Kandhamal", + "ORKO": "Koraput", + "ORKL": "Kalahandi", + "ORKJ": "Kendujhar (Keonjhar)", + "ORKH": "Khordha", + "NLMK": "Mokokchung", + "ORKP": "Kendrapara", + "NLMN": "Mon", + "KACT": "Chitradurga District", + "CGSU": "Surguja", + "MPNE": "Neemuch", + "TNNM": "Namakkal", + "MPNA": "Narsinghpur", + "TNNI": "The Nilgiris", + "TNNG": "Nagapattinam", + "APHY": "Hyderabad", + "UANA": "Nainital", + "APSR": "Srikakulam", + "RJCR": "Churu", + "RJCT": "Chittorgarh", + "MZMA": "Mamit", + "MHMC": "Mumbai City", + "UPET": "Etah", + "GJGA": "Gandhinagar", + "MHMU": "Mumbai suburban", + "WBKB": "Cooch Behar", + "HPCH": "Chamba", + "MPSG": "Sagar", + "HRPK": "Panchkula", + "ASKR": "Karimganj", + "MPSO": "Seoni", + "GJNV": "Navsari", + "MPSJ": "Shajapur", + "MPSH": "Shahdol", + "GJNR": "Narmada", + "MPSV": "Shivpuri", + "MPST": "Satna", + "ASKA": "Karbi Anglong", + "MPSP": "Sheopur", + "APEG": "East Godavari", + "HRPW": "Palwal", + "JKDO": "Doda", + "ASKK": "Kokrajhar", + "JHDU": "Dumka", + "ORRA": "Rayagada", + "JHDE": "Deoghar", + "MHJG": "Jalgaon", + "HRBH": "Bhiwani", + "TNDH": "Dharmapuri", + "JHDH": "Dhanbad", + "MHJN": "Jalna", + "UPBI": "Bijnor", + "UPBH": "Bahraich", + "UPBL": "Ballia", + "UPBN": "Banda District", + "HRKR": "Karnal", + "UPBB": "Barabanki", + "MZSE": "Serchhip", + "HRKU": "Kurukshetra", + "HRKT": "Kaithal", + "MNCD": "Chandel", + "MZSA": "Saiha", + "UPBP": "Balrampur", + "UPBS": "Basti", + "UPBR": "Bareilly", + "UPBU": "Bulandshahr", + "MLRB": "Ri-Bhoi", + "JKRA": "Rajauri", + "ORBR": "Bargarh (Baragarh)", + "BRNW": "Nawada", + "MHTH": "Thane", + "HPSI": "Sirmaur", + "RJDU": "Dungapur", + "APWA": "Warangal", + "ORBW": "Baleswar (Balasore)", + "TNER": "Erode", + "BRNL": "Nalanda", + "MPDE": "Dewas", + "KAGU": "Gulbarga District", + "TRNT": "North Tripura", + "KLID": "Idukki", + "MPDI": "Dindori", + "MPDH": "Dhar", + "KAGA": "Gadag District", + "MPDT": "Datia", + "JHSA": "Sahibganj", + "ORGP": "Gajapati", + "UAPG": "Pauri Garhwal", + "ORBL": "Bolangir (Balangir)", + "MPJH": "Jhabua", + "UPLA": "Lalitpur", + "MPJA": "Jabalpur", + "JKKR": "Kargil", + "JKKT": "Kathua", + "JKKU": "Kupwara", + "WBBN": "Bankura", + "KAUK": "Uttara Kannada", + "ASDI": "Dibrugarh", + "UPLU": "Lucknow", + "WBBR": "Bardhaman", + "ASDM": "Dhemaji", + "ASDA": "Darrang", + "ASDB": "Dhubri", + "HRYN": "Yamuna Nagar", + "BREC": "Purba Champaran", + "UABA": "Bageshwar", + "TNCU": "Cuddalore", + "MPMS": "Mandsaur", + "MPML": "Mandla", + "GJRA": "Rajkot", + "MPMO": "Morena", + "TNCO": "Coimbatore", + "GJJU": "Junagadh", + "TNVE": "Vellore", + "TNVL": "Villupuram", + "UPHR": "Hardoi", + "ORDE": "Debagarh (Deogarh)", + "HRGU": "Gurgaon", + "RJJO": "Jodhpur", + "UPAH": "Allahabad", + "UPAL": "Aligarh", + "UPAN": "Ambedkar Nagar", + "CGBI": "Bilaspur", + "APWG": "West Godavari", + "UPAZ": "Azamgarh", + "CGBA": "Bastar", + "ORNY": "Nayagarh", + "BRWC": "Pashchim Champaran", + "ORNU": "Nuapada", + "MNWI": "Imphal West", + "UAAL": "Almora", + "JHHA": "Hazaribagh", + "ORNB": "Nabarangpur", + "ARUD": "Dibang Valley", + "ARUB": "Upper Subansiri", + "RJRA": "Rajsamand", + "APKR": "Krishna", + "MHPU": "Pune", + "APKU": "Kurnool", + "MPIN": "Indore", + "ASHA": "Hailakandi", + "UPGB": "Gautam Buddha Nagar", + "MHPA": "Parbhani", + "KARA": "Raichur District", + "SKWS": "West Sikkim", + "APKH": "Khammam", + "KARM": "Ramanagara District", + "DLNO": "North Delhi", + "BRJE": "Jehanabad", + "BRJA": "Jamui", + "JHWS": "Pashchim Singhbhum", + "DLND": "New Delhi", + "DLNE": "North East Delhi", + "DLNW": "North West Delhi", + "RJDH": "Dholpur", + "TNDI": "Dindigul", + "JKUD": "Udhampur", + "GJJA": "Jamnagar", + "UPHM": "Hamirpur", + "PBSA": "Sangrur", + "MPVI": "Vidisha", + "ORGN": "Ganjam", + "MHNB": "Nandurbar", + "UPHT": "Mahamaya Nagar", + "BRAR": "Araria", + "JKBP": "Bandipore", + "CGKB": "Korba", + "BRAU": "Aurangabad", + "CGKK": "Kanker", + "CGKJ": "Koriya", + "CGKW": "Kawardha", + "UAHA": "Haridwar", + "GJMA": "Mehsana", + "RJKO": "Kota", + "MNEI": "Imphal East", + "RJKA": "Karauli", + "ARLB": "Lower Subansiri", + "MPDM": "Damoh" + } # Field containing the Line Item to which the project belongs to. line_item = models.CharField(max_length=256, - choices=LINE_ITEM_CHOICES) + choices=tuple(LINE_ITEM_CHOICES.items())) # Field containing the name of the institution working on the # project. @@ -50,16 +676,16 @@ # Field containing the state to which the institution belongs to. state = models.CharField(max_length=256, - choices=STATE_CHOICES) - - mobile_num = models.CharField(max_length=20) - - fax_num = models.CharField(max_length=20, null=True) + choices=tuple(STATE_CHOICES.items())) # Field containing the district to which the institution belongs # to in the state of India. district = models.CharField(max_length=256, - choices=DISTRICT_CHOICES) + choices=tuple(DISTRICT_CHOICES.items())) + + mobile_num = models.CharField(max_length=20) + + fax_num = models.CharField(max_length=20, null=True, blank=True) # Field containing the autogenerated MICR code for the project. micr_code = models.CharField(max_length=15, unique=True) diff -r 05b9e60e6a10 -r 0c9bdcfac9f7 app/projrev/views/helpers/forms.py --- a/app/projrev/views/helpers/forms.py Sat Aug 08 23:54:36 2009 +0530 +++ b/app/projrev/views/helpers/forms.py Sun Aug 09 12:39:51 2009 +0530 @@ -26,7 +26,8 @@ # fields in the Project that must not appear in the form, but have # be automatically generated. - fields = ('line_item', 'institution', 'state', 'district') + fields = ('line_item', 'institution', 'state', + 'district', 'mobile_num', 'fax_num') class ReviewForm(forms.ModelForm): """Creates a form for review of proposal. diff -r 05b9e60e6a10 -r 0c9bdcfac9f7 app/projrev/views/proposal.py --- a/app/projrev/views/proposal.py Sat Aug 08 23:54:36 2009 +0530 +++ b/app/projrev/views/proposal.py Sun Aug 09 12:39:51 2009 +0530 @@ -143,9 +143,9 @@ return HttpResponseRedirect( reverse('app.projrev.views.proposal.submit', args=(micr_code,))) - return HttpResponseRedirect('') + return submitGet(request, micr_code, prop_form) -def submitGet(request, micr_code=None): +def submitGet(request, micr_code=None, prop_form=None): """Handles GET request for the submission of proposal form. """ @@ -161,8 +161,9 @@ 'state': Project.getStateCode(project.state), 'district': Project.getDistrictCode(project.district), } - prop_form = projrev_forms.ProposalForm( - initial=initial_vals, instance=project) + if not prop_form: + prop_form = projrev_forms.ProposalForm( + initial=initial_vals, instance=project) proposal = project.proposal_set.all().order_by('-submitted_on')[0] @@ -193,7 +194,8 @@ context['nr_reviews'] = len(reviews) else: - prop_form = projrev_forms.ProposalForm() + if not prop_form: + prop_form = projrev_forms.ProposalForm() context['form'] = prop_form