Skip to content

Commit

Permalink
Merge pull request #36 from robotichead/development-0.11
Browse files Browse the repository at this point in the history
Development 0.11
  • Loading branch information
robotichead authored Mar 21, 2018
2 parents 3974b12 + 1e7c6c6 commit 5a6cf27
Show file tree
Hide file tree
Showing 102 changed files with 12,934 additions and 1,226 deletions.
10 changes: 10 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,3 +53,13 @@ Note: jQuery help shorten a lot of the javascript code within NearBeach. There a



### jQuery File Upload
Creator(s): Sebastian Tschan

Github: https://github.com/blueimp/jQuery-File-Upload

Link: https://blueimp.github.io/jQuery-File-Upload/

License : MIT

Note: jQuery File Upload is used when there is a file to be uploaded through the AJAX method.
7 changes: 7 additions & 0 deletions admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,11 @@
admin.site.register(folders)
admin.site.register(group_permissions)
admin.site.register(groups)
admin.site.register(kanban_board)
admin.site.register(kanban_comment)
admin.site.register(kanban_card)
admin.site.register(kanban_column)
admin.site.register(kanban_level)
admin.site.register(list_of_amount_type)
admin.site.register(list_of_currency)
admin.site.register(list_of_contact_types)
Expand All @@ -24,6 +29,7 @@
admin.site.register(list_of_quote_stages)
admin.site.register(list_of_requirement_item_status)
admin.site.register(list_of_requirement_item_type)
admin.site.register(list_of_requirement_status)
admin.site.register(list_of_taxes)
admin.site.register(list_of_titles)
admin.site.register(opportunity)
Expand Down Expand Up @@ -53,6 +59,7 @@
admin.site.register(tasks_groups)
admin.site.register(tasks_history)
admin.site.register(tasks)
admin.site.register(to_do)
admin.site.register(user_groups)


Expand Down
102 changes: 102 additions & 0 deletions forms.py
Original file line number Diff line number Diff line change
Expand Up @@ -573,6 +573,93 @@ class information_task_history_form(forms.Form):
)


class kanban_card_form(ModelForm):
def __init__(self, *args, **kwargs):
kanban_board_id = kwargs.pop('kanban_board_id')

super(kanban_card_form, self).__init__(*args, **kwargs)

self.fields['kanban_column'].queryset = kanban_column.objects.filter(kanban_board=kanban_board_id)
self.fields['kanban_level'].queryset = kanban_level.objects.filter(kanban_board=kanban_board_id)

kanban_card_comment = forms.CharField(
required=False,
widget=TextInput(attrs={
'placeholder': 'Card Comments',
}),
)

kanban_card_text = forms.CharField(
required=True,
max_length=255,
widget=TextInput(attrs={
'placeholder': 'Card Text',
}),
)

class Meta:
model = kanban_card
fields = {
'kanban_card_text',
'kanban_column',
'kanban_level',
}


class kanban_board_form(forms.Form):
kanban_board_name = forms.CharField(
max_length=255,
widget=TextInput(attrs={
'placeholder': 'Board Name',
}),
)
kanban_board_column = forms.CharField(
widget=forms.Textarea(attrs={
'placeholder': 'Please place each new column on a new line. Each name will be truncated to 255 characters',
}),
required=True,
)
kanban_board_level = forms.CharField(
widget=forms.Textarea(attrs={
'placeholder': 'Please place each new level on a new line. Each name will be truncated to 255 characters',
}),
required=True,
)


class kanban_properties_form(ModelForm):
kanban_board_name=forms.CharField(
max_length=255,
widget=TextInput(attrs={
'placeholder': 'Board Name',
}),
required=True,
)
class Meta:
model = kanban_board
fields = {
'kanban_board_name',
}




class kanban_new_link_form(ModelForm):
def __init__(self, *args, **kwargs):
kanban_board_id = kwargs.pop('kanban_board_id')

super(kanban_new_link_form, self).__init__(*args, **kwargs)

self.fields['kanban_column'].queryset = kanban_column.objects.filter(kanban_board=kanban_board_id)
self.fields['kanban_level'].queryset = kanban_level.objects.filter(kanban_board=kanban_board_id)
class Meta:
model = kanban_card
fields = {
'kanban_column',
'kanban_level',
}


class list_of_taxes_form(ModelForm):
class Meta:
model = list_of_taxes
Expand Down Expand Up @@ -1133,6 +1220,7 @@ class Meta:
'requirement_title',
'requirement_scope',
'requirement_type',
'requirement_status',
}


Expand Down Expand Up @@ -1732,6 +1820,20 @@ class Meta:
}


class to_do_form(ModelForm):
to_do = forms.CharField(
max_length=255,
widget=forms.TextInput(attrs={
'placeholder': 'To do next?',
})
)
class Meta:
model=to_do
fields={
'to_do'
}



class user_information_form(ModelForm):
password1 = forms.CharField(
Expand Down
Loading

0 comments on commit 5a6cf27

Please sign in to comment.