Merge pull request #11 from robotichead/development-0.6

Development 0.6
nearbeach · Sep 18, 2017 · 14cb68f · 14cb68f
2 parents 8ac7ba1 + bbb9786
commit 14cb68f
Show file tree

Hide file tree

Showing 280 changed files with 2,140 additions and 864 deletions.
diff --git a/admin.py b/admin.py
@@ -8,7 +8,10 @@
 admin.site.register(costs)
 admin.site.register(customers)
 admin.site.register(customers_campus)
-admin.site.register(document_folders)
+admin.site.register(documents)
+admin.site.register(documents_folder)
+admin.site.register(document_permissions)
+admin.site.register(folders)
 admin.site.register(group_permissions)
 admin.site.register(groups)
 admin.site.register(list_of_amount_type)
@@ -23,13 +26,11 @@
 admin.site.register(opportunity_next_step)
 admin.site.register(organisations)
 admin.site.register(organisations_campus)
-admin.site.register(organisation_customers_documents)
 admin.site.register(project_customers)
 admin.site.register(project_groups)
 admin.site.register(project_history)
 admin.site.register(project_stages)
 admin.site.register(project_tasks)
-admin.site.register(project_tasks_documents)
 admin.site.register(project)
 admin.site.register(stages)
 admin.site.register(tasks_actions)

diff --git a/forms.py b/forms.py
@@ -179,7 +179,7 @@ class Meta:
 		model = customers_campus
 		fields = { 
 					'customer_phone', 
-					'customer_fax' 
+					'customer_fax'
 				}
 
 
@@ -199,7 +199,13 @@ class campus_information_form(ModelForm):
 	class Meta:
 		model = organisations_campus
 		fields = '__all__'
-		exclude = ['campus_region_id', 'campus_country_id','organisations_id','is_deleted']
+		exclude = [
+			'campus_region_id',
+			'campus_country_id',
+			'organisations_id',
+			'is_deleted',
+			'change_user',
+		]
 
 
 
@@ -213,8 +219,12 @@ class customer_information_form(ModelForm):
 	start_date_year = forms.ChoiceField(choices = YEAR_CHOICES, widget=forms.Select(attrs={"onChange":'check_start_date()'}))
 	start_date_month = forms.ChoiceField(choices = MONTH_CHOICES, widget=forms.Select(attrs={"onChange":'check_start_date()'}))
 	start_date_day = forms.ChoiceField(choices = DAY_CHOICES, widget=forms.Select(attrs={"onChange":'check_start_date()'}))
+	start_date_hour = forms.ChoiceField(choices = HOUR_CHOICES)
+	start_date_minute = forms.ChoiceField(choices = MINUTE_CHOICES)
+	start_date_meridiems = forms.ChoiceField(choices = MERIDIEMS_CHOICES)
 
-	contact_history = forms.CharField(widget=forms.TextInput(attrs={'width': '99%','height': '300px'}), required=False)
+
+	contact_history = forms.CharField(widget=forms.Textarea(attrs={'width': '99%','max-height': '300px'}), required=False)
 
 	contact_attachment = forms.FileField(required=False, widget=forms.FileInput(attrs={'onChange':'enable_submit()'}))
 
@@ -230,6 +240,7 @@ class Meta:
 		exclude = [
 			'is_deleted',
 			'organisations_id',
+			'change_user',
 		]
 
 	def clean_update_profile_picture(self):
@@ -364,7 +375,8 @@ class Meta:
 			'date_created',
 			'date_modified',
 			'user_id',
-			'is_deleted'
+			'is_deleted',
+			'change_user',
 		}
 
 class new_organisation_form(forms.Form):
@@ -446,7 +458,8 @@ class Meta:
 			'date_created',
 			'date_modified',
 			'user_id',
-			'is_deleted'
+			'is_deleted',
+			'change_user',
 		}
 
 class organisation_information_form(ModelForm):
@@ -464,7 +477,7 @@ class organisation_information_form(ModelForm):
 	start_date_day = forms.ChoiceField(choices=DAY_CHOICES,
 									   widget=forms.Select(attrs={"onChange": 'check_start_date()'}))
 
-	contact_history = forms.CharField(widget=forms.TextInput(attrs={'width': '99%', 'height': '300px'}), required=False)
+	contact_history = forms.CharField(widget=forms.Textarea(attrs={'width': '99%'}), required=False)
 	contact_attachment = forms.FileField(required=False, widget=forms.FileInput(attrs={'onChange': 'enable_submit()'}))
 
 	#Profile picture
@@ -531,7 +544,7 @@ class project_information_form(ModelForm):
 	document_url_location = forms.URLField(required=False, widget=forms.TextInput(attrs={'placeholder':'https://example.com', 'onChange':'enable_submit()'}))
 	document_description = forms.CharField(max_length=255, required=False, widget=forms.TextInput(attrs={'width':'100%', 'onkeyup':'enable_submit()'}))
 
-	document_folder_description = forms.CharField(max_length=255, required=False, widget=forms.TextInput(attrs={'width':'100%', 'onkeyup':'enable_submit()'}))
+	folder_description = forms.CharField(max_length=255, required=False, widget=forms.TextInput(attrs={'width':'100%', 'onkeyup':'enable_submit()'}))
 
 	# Costs feature
 	cost_description = forms.CharField(
@@ -627,7 +640,17 @@ class task_information_form(ModelForm):
 	document_url_location = forms.URLField(required=False, widget=forms.TextInput(attrs={'placeholder':'https://example.com', 'onChange':'enable_submit()'}))
 	document_description = forms.CharField(max_length=255, required=False, widget=forms.TextInput(attrs={'width':'100%', 'onkeyup':'enable_submit()'}))
 
-	document_folder_description = forms.CharField(max_length=255, required=False, widget=forms.TextInput(attrs={'width': '100%', 'onkeyup': 'enable_submit()'}))
+	folder_description = forms.CharField(
+		max_length=255,
+		required=False,
+		widget=forms.TextInput(
+			attrs={
+				'width': '100%',
+				'onkeyup': 'enable_submit()'
+			}
+		)
+	)
+
 
 	#Costs feature
 	cost_description=forms.CharField(