Skip to content

initial_fork_commit #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lucasarana wants to merge 13 commits into
base: master
Choose a base branch
from
Open

initial_fork_commit #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
0af2878
initial_fork_commit
Mar 14, 2016
b071e3d
wip
Mar 14, 2016
5cfc43a
changed all leads names for devs
Mar 14, 2016
e229fb4
added generic_list and fields for new emails
Mar 14, 2016
0ba0ace
added_automatic_github_invitation
Mar 16, 2016
3075f52
asana_integration_added
Mar 16, 2016
87be0bf
add_delete_asana_git_finished
Mar 17, 2016
2b7a9bc
trying_timetag_#time 4h30m
Mar 21, 2016
0e4073c
finished_initial_template #time 4h30m
Mar 21, 2016
0c29953
fixed 30 messages commits_Added since/until and dev filter #time 8h30m
Mar 22, 2016
d7ba5c6
changed database to postgres #time 1h30m
Mar 30, 2016
9aeda4f
Merge pull request #3 from onitsoft/generic_list
BeOleg Feb 1, 2017
cf670dc
Merge pull request #5 from onitsoft/time_tag
BeOleg Feb 1, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 karinacms/lead_center/__init__.py → karinacms/dev_center/__init__.py
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions karinacms/lead_center/admin.py → karinacms/dev_center/admin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from django.contrib import admin
from lead_center.models import Campaign, Lead
from dev_center.models import Campaign, Dev

admin.site.register(Campaign);
admin.site.register(Lead);
admin.site.register(Dev);
# Register your models here.
0 karinacms/lead_center/custom_permissions.py → karinacms/dev_center/custom_permissions.py
View file
Open in desktop
File renamed without changes.
27 changes: 18 additions & 9 deletions karinacms/lead_center/forms.py → karinacms/dev_center/forms.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
from django import forms
from django.contrib.auth.models import User
from .models import Lead, Campaign, LeadComment, LeadStatus, UserInfo, Product
from .models import Dev, Campaign, DevComment, DevStatus, UserInfo, Product, DevHours
from django.forms.extras.widgets import SelectDateWidget

class BootstrapForm(forms.ModelForm):
def __init__(self, *args, **kwargs):
Expand Down Expand Up @@ -31,9 +32,16 @@ class Meta:
model = Campaign
fields = ('name', 'description',)

class LeadStatusForm(BootstrapForm):
class DevHoursForm(BootstrapForm):
since = forms.DateField(widget=SelectDateWidget, required=False)
until = forms.CharField(widget=SelectDateWidget, required=False)
class Meta:
model = LeadStatus
model = DevHours
fields = ('dev', 'since', 'until',)

class DevStatusForm(BootstrapForm):
class Meta:
model = DevStatus
fields = ('name', 'description',)

class UserLoginForm(BootstrapForm):
Expand All @@ -43,22 +51,23 @@ class Meta:
model = User
fields = ('username', 'password',)

class LeadForm(BootstrapForm):
class DevForm(BootstrapForm):
class Meta:
model = Lead
model = Dev
fields = ('first_name', 'last_name', 'city', 'phone',
'email', 'comment', 'status', 'campaign', 'product')
'email', 'comment', 'status', 'campaign', 'product',
'asana', 'github', 'slack')


class leadCommentForm(BootstrapForm):
class DevCommentForm(BootstrapForm):
title = forms.CharField(max_length=512, help_text="Summary of the call")
comment = forms.CharField(max_length=1024, widget=forms.Textarea, help_text="Description of the call")
def __init__(self, *args, **kwargs):
super(leadCommentForm, self).__init__(*args, **kwargs)
super(DevCommentForm, self).__init__(*args, **kwargs)
self.fields['title'].widget.attrs['class'] = 'form-control'
self.fields['comment'].widget.attrs['class'] = 'form-control'
class Meta:
model = LeadComment
model = DevComment
fields = ('title', 'comment',)


106 changes: 56 additions & 50 deletions ...ms/lead_center/migrations/0001_initial.py → ...cms/dev_center/migrations/0001_initial.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,86 +9,89 @@ class Migration(SchemaMigration):

def forwards(self, orm):
# Adding model 'UserInfo'
db.create_table(u'lead_center_userinfo', (
db.create_table(u'dev_center_userinfo', (
(u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
('user', self.gf('django.db.models.fields.related.OneToOneField')(to=orm['auth.User'], unique=True)),
('site', self.gf('django.db.models.fields.URLField')(max_length=200, blank=True)),
))
db.send_create_signal(u'lead_center', ['UserInfo'])
db.send_create_signal(u'dev_center', ['UserInfo'])

# Adding model 'Campaign'
db.create_table(u'lead_center_campaign', (
db.create_table(u'dev_center_campaign', (
(u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
('name', self.gf('django.db.models.fields.CharField')(max_length=255)),
('description', self.gf('django.db.models.fields.CharField')(max_length=512, blank=True)),
('view', self.gf('django.db.models.fields.CharField')(max_length=50, blank=True)),
))
db.send_create_signal(u'lead_center', ['Campaign'])
db.send_create_signal(u'dev_center', ['Campaign'])

# Adding model 'Product'
db.create_table(u'lead_center_product', (
db.create_table(u'dev_center_product', (
(u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
('name', self.gf('django.db.models.fields.CharField')(max_length=255)),
('description', self.gf('django.db.models.fields.CharField')(max_length=512, blank=True)),
))
db.send_create_signal(u'lead_center', ['Product'])
db.send_create_signal(u'dev_center', ['Product'])

# Adding model 'LeadStatus'
db.create_table(u'lead_center_leadstatus', (
# Adding model 'DevStatus'
db.create_table(u'dev_center_devstatus', (
(u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
('name', self.gf('django.db.models.fields.CharField')(max_length=255)),
('description', self.gf('django.db.models.fields.CharField')(max_length=512, blank=True)),
))
db.send_create_signal(u'lead_center', ['LeadStatus'])
db.send_create_signal(u'dev_center', ['DevStatus'])

# Adding model 'Lead'
db.create_table(u'lead_center_lead', (
# Adding model 'Dev'
db.create_table(u'dev_center_dev', (
(u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
('campaign', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['lead_center.Campaign'], null=True)),
('product', self.gf('django.db.models.fields.related.ForeignKey')(related_name='product_leads', null=True, to=orm['lead_center.Product'])),
('status', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['lead_center.LeadStatus'], null=True)),
('campaign_url', self.gf('django.db.models.fields.CharField')(max_length=100, null=True)),
('campaign', self.gf('django.db.models.fields.related.ForeignKey')(blank=True, related_name='campaign_devs', null=True, to=orm['dev_center.Campaign'])),
('product', self.gf('django.db.models.fields.related.ForeignKey')(blank=True, related_name='product_devs', null=True, to=orm['dev_center.Product'])),
('status', self.gf('django.db.models.fields.related.ForeignKey')(blank=True, related_name='status_devs', null=True, to=orm['dev_center.DevStatus'])),
('campaign_url', self.gf('django.db.models.fields.CharField')(max_length=100, blank=True)),
('phone', self.gf('django.db.models.fields.CharField')(max_length=15)),
('email', self.gf('django.db.models.fields.CharField')(max_length=60, blank=True)),
('asana', self.gf('django.db.models.fields.CharField')(max_length=60, blank=True)),
('github', self.gf('django.db.models.fields.CharField')(max_length=60, blank=True)),
('slack', self.gf('django.db.models.fields.CharField')(max_length=60, blank=True)),
('first_name', self.gf('django.db.models.fields.CharField')(max_length=40)),
('last_name', self.gf('django.db.models.fields.CharField')(max_length=40)),
('city', self.gf('django.db.models.fields.CharField')(max_length=50, null=True)),
('city', self.gf('django.db.models.fields.CharField')(max_length=50, blank=True)),
('comment', self.gf('django.db.models.fields.CharField')(max_length=255, blank=True)),
('ip', self.gf('django.db.models.fields.CharField')(max_length=30, null=True)),
('agent', self.gf('django.db.models.fields.CharField')(max_length=60, null=True)),
('ip', self.gf('django.db.models.fields.CharField')(max_length=30, blank=True)),
('agent', self.gf('django.db.models.fields.CharField')(max_length=60, blank=True)),
))
db.send_create_signal(u'lead_center', ['Lead'])
db.send_create_signal(u'dev_center', ['Dev'])

# Adding model 'LeadComment'
db.create_table(u'lead_center_leadcomment', (
# Adding model 'DevComment'
db.create_table(u'dev_center_devcomment', (
(u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
('lead', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['lead_center.Lead'])),
('dev', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['dev_center.Dev'])),
('user', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'])),
('title', self.gf('django.db.models.fields.CharField')(max_length=512)),
('comment', self.gf('django.db.models.fields.TextField')(max_length=1024)),
('time', self.gf('django.db.models.fields.DateTimeField')(auto_now=True, blank=True)),
))
db.send_create_signal(u'lead_center', ['LeadComment'])
db.send_create_signal(u'dev_center', ['DevComment'])


def backwards(self, orm):
# Deleting model 'UserInfo'
db.delete_table(u'lead_center_userinfo')
db.delete_table(u'dev_center_userinfo')

# Deleting model 'Campaign'
db.delete_table(u'lead_center_campaign')
db.delete_table(u'dev_center_campaign')

# Deleting model 'Product'
db.delete_table(u'lead_center_product')
db.delete_table(u'dev_center_product')

# Deleting model 'LeadStatus'
db.delete_table(u'lead_center_leadstatus')
# Deleting model 'DevStatus'
db.delete_table(u'dev_center_devstatus')

# Deleting model 'Lead'
db.delete_table(u'lead_center_lead')
# Deleting model 'Dev'
db.delete_table(u'dev_center_dev')

# Deleting model 'LeadComment'
db.delete_table(u'lead_center_leadcomment')
# Deleting model 'DevComment'
db.delete_table(u'dev_center_devcomment')


models = {
Expand Down Expand Up @@ -128,56 +131,59 @@ def backwards(self, orm):
'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
},
u'lead_center.campaign': {
u'dev_center.campaign': {
'Meta': {'object_name': 'Campaign'},
'description': ('django.db.models.fields.CharField', [], {'max_length': '512', 'blank': 'True'}),
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
'view': ('django.db.models.fields.CharField', [], {'max_length': '50', 'blank': 'True'})
},
u'lead_center.lead': {
'Meta': {'object_name': 'Lead'},
'agent': ('django.db.models.fields.CharField', [], {'max_length': '60', 'null': 'True'}),
'campaign': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['lead_center.Campaign']", 'null': 'True'}),
'campaign_url': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True'}),
'city': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True'}),
u'dev_center.dev': {
'Meta': {'object_name': 'Dev'},
'agent': ('django.db.models.fields.CharField', [], {'max_length': '60', 'blank': 'True'}),
'asana': ('django.db.models.fields.CharField', [], {'max_length': '60', 'blank': 'True'}),
'campaign': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'campaign_devs'", 'null': 'True', 'to': u"orm['dev_center.Campaign']"}),
'campaign_url': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}),
'city': ('django.db.models.fields.CharField', [], {'max_length': '50', 'blank': 'True'}),
'comment': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
'email': ('django.db.models.fields.CharField', [], {'max_length': '60', 'blank': 'True'}),
'first_name': ('django.db.models.fields.CharField', [], {'max_length': '40'}),
'github': ('django.db.models.fields.CharField', [], {'max_length': '60', 'blank': 'True'}),
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'ip': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True'}),
'ip': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
'last_name': ('django.db.models.fields.CharField', [], {'max_length': '40'}),
'phone': ('django.db.models.fields.CharField', [], {'max_length': '15'}),
'product': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'product_leads'", 'null': 'True', 'to': u"orm['lead_center.Product']"}),
'status': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['lead_center.LeadStatus']", 'null': 'True'})
'product': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'product_devs'", 'null': 'True', 'to': u"orm['dev_center.Product']"}),
'slack': ('django.db.models.fields.CharField', [], {'max_length': '60', 'blank': 'True'}),
'status': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'status_devs'", 'null': 'True', 'to': u"orm['dev_center.DevStatus']"})
},
u'lead_center.leadcomment': {
'Meta': {'object_name': 'LeadComment'},
u'dev_center.devcomment': {
'Meta': {'object_name': 'DevComment'},
'comment': ('django.db.models.fields.TextField', [], {'max_length': '1024'}),
'dev': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['dev_center.Dev']"}),
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'lead': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['lead_center.Lead']"}),
'time': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
'title': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"})
},
u'lead_center.leadstatus': {
'Meta': {'object_name': 'LeadStatus'},
u'dev_center.devstatus': {
'Meta': {'object_name': 'DevStatus'},
'description': ('django.db.models.fields.CharField', [], {'max_length': '512', 'blank': 'True'}),
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'name': ('django.db.models.fields.CharField', [], {'max_length': '255'})
},
u'lead_center.product': {
u'dev_center.product': {
'Meta': {'object_name': 'Product'},
'description': ('django.db.models.fields.CharField', [], {'max_length': '512', 'blank': 'True'}),
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'name': ('django.db.models.fields.CharField', [], {'max_length': '255'})
},
u'lead_center.userinfo': {
u'dev_center.userinfo': {
'Meta': {'object_name': 'UserInfo'},
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'site': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}),
'user': ('django.db.models.fields.related.OneToOneField', [], {'to': u"orm['auth.User']", 'unique': 'True'})
}
}

complete_apps = ['lead_center']
complete_apps = ['dev_center']
Loading