From 0af28784b6ab1d8d94d24c72c8387361e8e57ad2 Mon Sep 17 00:00:00 2001
From: root <arana_lucas@hotmail.com>
Date: Mon, 14 Mar 2016 10:35:11 -0300
Subject: [PATCH 01/11] initial_fork_commit

---
 karinacms/requirements.txt | 2 +-
 requirements.txt           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/karinacms/requirements.txt b/karinacms/requirements.txt
index fe103b2..b81b2b3 100644
--- a/karinacms/requirements.txt
+++ b/karinacms/requirements.txt
@@ -1,6 +1,6 @@
 Django==1.6
 Markdown==2.3.1
-PIL==1.1.7
+#PIL==1.1.7
 South==0.8.4
 argparse==1.2.1
 distribute==0.6.24
diff --git a/requirements.txt b/requirements.txt
index ae06b6d..c3045c5 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
 Django==1.6
-PIL==1.1.7
+#PIL==1.1.7
 South==0.8.4
 argparse==1.2.1
 distribute==0.6.24

From b071e3dfc12c154064ff935f6548a62ed6d0eceb Mon Sep 17 00:00:00 2001
From: root <arana_lucas@hotmail.com>
Date: Mon, 14 Mar 2016 11:22:40 -0300
Subject: [PATCH 02/11] wip

---
 karinacms/karinacms/urls.py                      |  2 +-
 karinacms/templates/lead_center/common/base.html | 14 +++++++-------
 karinacms/templates/lead_center/index.html       |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/karinacms/karinacms/urls.py b/karinacms/karinacms/urls.py
index 84f38a0..1df5ef2 100644
--- a/karinacms/karinacms/urls.py
+++ b/karinacms/karinacms/urls.py
@@ -9,7 +9,7 @@
 router.register(r'leads', views.LeadViewSet)
 
 urlpatterns = patterns('',
-	url(r'^leads/', include('lead_center.urls')),
+	url(r'^devs/', include('lead_center.urls')),
     url(r'^admin/', include(admin.site.urls)),
     url(r'^api/', include(router.urls)),
     # url(r'^api/', include('rest_framework.urls', namespace='rest_framework')),
diff --git a/karinacms/templates/lead_center/common/base.html b/karinacms/templates/lead_center/common/base.html
index 07e34cf..226d873 100644
--- a/karinacms/templates/lead_center/common/base.html
+++ b/karinacms/templates/lead_center/common/base.html
@@ -17,27 +17,27 @@
             <h3>Options</h3>
                 <ul class="sidebar-nav"> 
                     <li>
-                        <a href="/leads/add_lead"> 
-                            Add new lead
+                        <a href="/devs/add_lead">
+                            Add new dev
                         </a>
                     </li>
                     <li>
-                        <a href="/leads/products">
+                        <a href="/devs/products">
                             Services
                         </a>
                     </li>
                     <li>
-                        <a href="/leads/campaigns">
+                        <a href="/devs/campaigns">
                             Campaigns
                         </a>
                     </li>
                     <li>    
-                        <a href="/leads/statuses">
-                            Lead statuses
+                        <a href="/devs/statuses">
+                            Devs statuses
                         </a>
                     </li>
                <!--      <li>
-                        <a href="/leads/options">
+                        <a href="/devs/options">
                             Options
                         </a>
                     </li> -->
diff --git a/karinacms/templates/lead_center/index.html b/karinacms/templates/lead_center/index.html
index bc7c77f..df4ecc5 100644
--- a/karinacms/templates/lead_center/index.html
+++ b/karinacms/templates/lead_center/index.html
@@ -1,6 +1,6 @@
 {% extends "lead_center/common/base.html" %}
 {% block content %}
-        <h1>Lead database</h1>
+        <h1>Devs database</h1>
         {% if leads %}
             <div class="tbl">
                 <div style="font-weight:bold;" class="row">
@@ -45,7 +45,7 @@ <h1>Lead database</h1>
         {% else %}
                 <div style="row">
                     <div class="col-lg-12">
-                        No lead are currently available
+                        No Devs are currently available
                     </div>
                 </div>
         {% endif %}

From 5cfc43a5812a624a4cb83d2bcc67525a96d5d5aa Mon Sep 17 00:00:00 2001
From: root <arana_lucas@hotmail.com>
Date: Mon, 14 Mar 2016 12:13:35 -0300
Subject: [PATCH 03/11] changed all leads names for devs

---
 .../{lead_center => dev_center}/__init__.py   |   0
 .../{lead_center => dev_center}/admin.py      |   4 +-
 .../custom_permissions.py                     |   0
 .../{lead_center => dev_center}/forms.py      |  16 +--
 .../migrations/0001_initial.py                |  84 +++++------
 .../migrations/0002_01.py                     |   0
 .../migrations/__init__.py                    |   0
 .../{lead_center => dev_center}/models.py     |  14 +-
 .../serializers.py                            |   6 +-
 .../templatetags/__init__.py                  |   0
 .../templatetags/custom_filters.py            |   0
 .../{lead_center => dev_center}/tests.py      |   0
 karinacms/dev_center/urls.py                  |  23 ++++
 .../{lead_center => dev_center}/views.py      | 130 +++++++++---------
 karinacms/karinacms/settings.py               |   6 +-
 karinacms/karinacms/urls.py                   |   6 +-
 karinacms/lead_center/urls.py                 |  23 ----
 .../{lead_center => dev_center}/about.html    |   6 +-
 .../campaign_list.html                        |   4 +-
 .../common/base.html                          |   6 +-
 .../common/delete_obj.html                    |   0
 .../common/edit_obj.html                      |   2 +-
 .../common/genericForm.html                   |   0
 .../common/header.html                        |   6 +-
 .../dev_form.html}                            |   8 +-
 .../dev_page.html}                            |  18 +--
 .../{lead_center => dev_center}/index.html    |  16 +--
 .../{lead_center => dev_center}/login.html    |   4 +-
 .../product_list.html                         |   4 +-
 .../{lead_center => dev_center}/register.html |   4 +-
 .../status_list.html                          |   6 +-
 31 files changed, 198 insertions(+), 198 deletions(-)
 rename karinacms/{lead_center => dev_center}/__init__.py (100%)
 rename karinacms/{lead_center => dev_center}/admin.py (56%)
 rename karinacms/{lead_center => dev_center}/custom_permissions.py (100%)
 rename karinacms/{lead_center => dev_center}/forms.py (83%)
 rename karinacms/{lead_center => dev_center}/migrations/0001_initial.py (81%)
 rename karinacms/{lead_center => dev_center}/migrations/0002_01.py (100%)
 rename karinacms/{lead_center => dev_center}/migrations/__init__.py (100%)
 rename karinacms/{lead_center => dev_center}/models.py (87%)
 rename karinacms/{lead_center => dev_center}/serializers.py (50%)
 rename karinacms/{lead_center => dev_center}/templatetags/__init__.py (100%)
 rename karinacms/{lead_center => dev_center}/templatetags/custom_filters.py (100%)
 rename karinacms/{lead_center => dev_center}/tests.py (100%)
 create mode 100644 karinacms/dev_center/urls.py
 rename karinacms/{lead_center => dev_center}/views.py (61%)
 delete mode 100644 karinacms/lead_center/urls.py
 rename karinacms/templates/{lead_center => dev_center}/about.html (65%)
 rename karinacms/templates/{lead_center => dev_center}/campaign_list.html (93%)
 rename karinacms/templates/{lead_center => dev_center}/common/base.html (96%)
 rename karinacms/templates/{lead_center => dev_center}/common/delete_obj.html (100%)
 rename karinacms/templates/{lead_center => dev_center}/common/edit_obj.html (74%)
 rename karinacms/templates/{lead_center => dev_center}/common/genericForm.html (100%)
 rename karinacms/templates/{lead_center => dev_center}/common/header.html (84%)
 rename karinacms/templates/{lead_center/lead_form.html => dev_center/dev_form.html} (73%)
 rename karinacms/templates/{lead_center/lead_page.html => dev_center/dev_page.html} (86%)
 rename karinacms/templates/{lead_center => dev_center}/index.html (77%)
 rename karinacms/templates/{lead_center => dev_center}/login.html (92%)
 rename karinacms/templates/{lead_center => dev_center}/product_list.html (93%)
 rename karinacms/templates/{lead_center => dev_center}/register.html (81%)
 rename karinacms/templates/{lead_center => dev_center}/status_list.html (91%)

diff --git a/karinacms/lead_center/__init__.py b/karinacms/dev_center/__init__.py
similarity index 100%
rename from karinacms/lead_center/__init__.py
rename to karinacms/dev_center/__init__.py
diff --git a/karinacms/lead_center/admin.py b/karinacms/dev_center/admin.py
similarity index 56%
rename from karinacms/lead_center/admin.py
rename to karinacms/dev_center/admin.py
index d31b722..dcc4223 100644
--- a/karinacms/lead_center/admin.py
+++ b/karinacms/dev_center/admin.py
@@ -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.
diff --git a/karinacms/lead_center/custom_permissions.py b/karinacms/dev_center/custom_permissions.py
similarity index 100%
rename from karinacms/lead_center/custom_permissions.py
rename to karinacms/dev_center/custom_permissions.py
diff --git a/karinacms/lead_center/forms.py b/karinacms/dev_center/forms.py
similarity index 83%
rename from karinacms/lead_center/forms.py
rename to karinacms/dev_center/forms.py
index 84376dd..9dfe38b 100644
--- a/karinacms/lead_center/forms.py
+++ b/karinacms/dev_center/forms.py
@@ -1,6 +1,6 @@
 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
 
 class BootstrapForm(forms.ModelForm):
 	def __init__(self, *args, **kwargs):
@@ -31,9 +31,9 @@ class Meta:
 		model = Campaign
 		fields = ('name', 'description',)
 
-class LeadStatusForm(BootstrapForm):
+class DevStatusForm(BootstrapForm):
 	class Meta:
-		model = LeadStatus
+		model = DevStatus
 		fields = ('name', 'description',)
 
 class UserLoginForm(BootstrapForm):
@@ -43,22 +43,22 @@ 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')
 
 
-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',)
 
 
diff --git a/karinacms/lead_center/migrations/0001_initial.py b/karinacms/dev_center/migrations/0001_initial.py
similarity index 81%
rename from karinacms/lead_center/migrations/0001_initial.py
rename to karinacms/dev_center/migrations/0001_initial.py
index 140dedf..ced5a6c 100644
--- a/karinacms/lead_center/migrations/0001_initial.py
+++ b/karinacms/dev_center/migrations/0001_initial.py
@@ -9,44 +9,44 @@ 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', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['dev_center.Campaign'], null=True)),
+            ('product', self.gf('django.db.models.fields.related.ForeignKey')(related_name='product_devs', null=True, to=orm['dev_center.Product'])),
+            ('status', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['dev_center.DevStatus'], null=True)),
             ('campaign_url', self.gf('django.db.models.fields.CharField')(max_length=100, null=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)),
@@ -57,38 +57,38 @@ def forwards(self, orm):
             ('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)),
         ))
-        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 = {
@@ -128,17 +128,17 @@ 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'},
+        u'dev_center.dev': {
+            'Meta': {'object_name': 'Dev'},
             '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': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['dev_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'}),
             'comment': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
@@ -148,31 +148,31 @@ def backwards(self, orm):
             'ip': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': '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', [], {'related_name': "'product_devs'", 'null': 'True', 'to': u"orm['dev_center.Product']"}),
+            'status': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['dev_center.DevStatus']", 'null': 'True'})
         },
-        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'}),
             u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'lead': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['lead_center.Lead']"}),
+            'dev': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['dev_center.Dev']"}),
             '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'}),
@@ -180,4 +180,4 @@ def backwards(self, orm):
         }
     }
 
-    complete_apps = ['lead_center']
\ No newline at end of file
+    complete_apps = ['dev_center']
\ No newline at end of file
diff --git a/karinacms/lead_center/migrations/0002_01.py b/karinacms/dev_center/migrations/0002_01.py
similarity index 100%
rename from karinacms/lead_center/migrations/0002_01.py
rename to karinacms/dev_center/migrations/0002_01.py
diff --git a/karinacms/lead_center/migrations/__init__.py b/karinacms/dev_center/migrations/__init__.py
similarity index 100%
rename from karinacms/lead_center/migrations/__init__.py
rename to karinacms/dev_center/migrations/__init__.py
diff --git a/karinacms/lead_center/models.py b/karinacms/dev_center/models.py
similarity index 87%
rename from karinacms/lead_center/models.py
rename to karinacms/dev_center/models.py
index 0b3f70c..789a249 100644
--- a/karinacms/lead_center/models.py
+++ b/karinacms/dev_center/models.py
@@ -22,16 +22,16 @@ class Product(models.Model):
 	def __unicode__(self):
 		return self.name
 
-class LeadStatus(models.Model):
+class DevStatus(models.Model):
 	name = models.CharField(max_length=255)
 	description = models.CharField(max_length=512, blank=True)
 	def __unicode__(self):
 		return self.name
 
-class Lead(models.Model):
-	campaign = models.ForeignKey(Campaign, null=True, blank=True, related_name='campaign_leads')
-	product = models.ForeignKey(Product, null=True, blank=True, related_name='product_leads')
-	status = models.ForeignKey(LeadStatus, null=True, blank=True, related_name='status_leads')
+class Dev(models.Model):
+	campaign = models.ForeignKey(Campaign, null=True, blank=True, related_name='campaign_devs')
+	product = models.ForeignKey(Product, null=True, blank=True, related_name='product_devs')
+	status = models.ForeignKey(DevStatus, null=True, blank=True, related_name='status_devs')
 	campaign_url = models.CharField(max_length=100, blank=True)
 	phone = models.CharField(max_length=15)
 	email = models.CharField(max_length=60, blank=True)
@@ -46,8 +46,8 @@ def name(self):
 	def __unicode__(self):
 		return '%s %s' % (self.first_name, self.last_name)
 
-class LeadComment(models.Model):
-	lead = models.ForeignKey(Lead)
+class DevComment(models.Model):
+	dev = models.ForeignKey(Dev)
 	user = models.ForeignKey(User)
 	title = models.CharField(max_length=512, null=False)
 	comment = models.TextField(max_length=1024, null=False)
diff --git a/karinacms/lead_center/serializers.py b/karinacms/dev_center/serializers.py
similarity index 50%
rename from karinacms/lead_center/serializers.py
rename to karinacms/dev_center/serializers.py
index 76c2bbe..bbb242f 100644
--- a/karinacms/lead_center/serializers.py
+++ b/karinacms/dev_center/serializers.py
@@ -1,7 +1,7 @@
-from .models import Lead
+from .models import Dev
 from rest_framework import serializers
 
-class LeadSerializer(serializers.HyperlinkedModelSerializer):
+class DevSerializer(serializers.HyperlinkedModelSerializer):
     class Meta:
-		model = Lead
+		model = Dev
 		fields = ('first_name', 'last_name', 'phone',)
\ No newline at end of file
diff --git a/karinacms/lead_center/templatetags/__init__.py b/karinacms/dev_center/templatetags/__init__.py
similarity index 100%
rename from karinacms/lead_center/templatetags/__init__.py
rename to karinacms/dev_center/templatetags/__init__.py
diff --git a/karinacms/lead_center/templatetags/custom_filters.py b/karinacms/dev_center/templatetags/custom_filters.py
similarity index 100%
rename from karinacms/lead_center/templatetags/custom_filters.py
rename to karinacms/dev_center/templatetags/custom_filters.py
diff --git a/karinacms/lead_center/tests.py b/karinacms/dev_center/tests.py
similarity index 100%
rename from karinacms/lead_center/tests.py
rename to karinacms/dev_center/tests.py
diff --git a/karinacms/dev_center/urls.py b/karinacms/dev_center/urls.py
new file mode 100644
index 0000000..a642c5f
--- /dev/null
+++ b/karinacms/dev_center/urls.py
@@ -0,0 +1,23 @@
+from django.conf.urls import patterns, include, url
+
+from django.contrib import admin
+from dev_center import views
+admin.autodiscover()
+
+urlpatterns = patterns('',
+    url(r'^$', 'dev_center.views.index', name='index'),
+    # url(r'^about/', 'dev_center.views.about', name='about'),
+    url(r'^add_dev/(?P<campaign_name>.+)?', 'dev_center.views.dev_form', name='add_dev'),
+    url(r'^edit_dev/(?P<dev_id>\d+)/$', 'dev_center.views.dev_edit_form', name='edit_dev'),
+    url(r'^dev_page/(?P<dev_name>.+)?', 'dev_center.views.dev_page', name='dev_page'),
+    url(r'^products/', 'dev_center.views.product_list', name='product_list'),
+    url(r'^campaigns/', 'dev_center.views.campaign_list', name='campaign_list'),
+    url(r'^statuses/', 'dev_center.views.status_list', name='status_list'),
+    # url(r'^blog/', includedev_center('blog.urls')),
+    url(r'^register/', 'dev_center.views.register', name='register'),#TODO: remove those paths to the root urls.py
+    url(r'^login/', 'dev_center.views.user_login', name='login'),
+    url(r'^logout/', 'dev_center.views.user_logout', name='logout'),
+    url(r'^search_list/$', 'dev_center.views.search_list', name='search_list'),
+    url(r'^edit/(?P<obj_type>.+)/(?P<obj_id>\d+)$', 'dev_center.views.edit_obj', name='edit_obj'),   #url(r'^admin/', include(admin.site.urls)),
+    url(r'^delete/(?P<obj_type>.+)/(?P<obj_id>\d+)$', 'dev_center.views.delete_obj', name='delete_obj'),
+)
\ No newline at end of file
diff --git a/karinacms/lead_center/views.py b/karinacms/dev_center/views.py
similarity index 61%
rename from karinacms/lead_center/views.py
rename to karinacms/dev_center/views.py
index ed60148..a1df8d0 100644
--- a/karinacms/lead_center/views.py
+++ b/karinacms/dev_center/views.py
@@ -3,22 +3,22 @@
 from django.contrib.auth import authenticate, login, logout
 from django.contrib.auth.decorators import login_required
 from django.db.models import Count
-from .forms import LeadForm, CampaignForm, leadCommentForm, UserForm, UserInfoForm, ProductForm, LeadStatusForm
-from .models import Campaign, Lead, LeadComment, LeadStatus, UserInfo, Product
+from .forms import DevForm, CampaignForm, DevCommentForm, UserForm, UserInfoForm, ProductForm, DevStatusForm
+from .models import Campaign, Dev, DevComment, DevStatus, UserInfo, Product
 from django.http import HttpResponseRedirect, HttpResponse
 from datetime import datetime
 from django.conf import settings
 
 from rest_framework import viewsets, permissions
-from .serializers import LeadSerializer
+from .serializers import DevSerializer
 from .custom_permissions import PostOnly
 
-class LeadViewSet(viewsets.ModelViewSet):
+class DevViewSet(viewsets.ModelViewSet):
     """
-    API endpoint that allows leads being viewed and edited
+    API endpoint that allows devs being viewed and edited
     """
-    model = Lead
-    serializer_class = LeadSerializer
+    model = Dev
+    serializer_class = DevSerializer
     permission_classes = [PostOnly]
 
 
@@ -36,7 +36,7 @@ def register(request):
 		registered = True
 	
 	context = {'userForm': userForm, 'userInfoForm': userInfoForm, 'registered': registered}
-	return render(request, 'lead_center/register.html', context)
+	return render(request, 'dev_center/register.html', context)
 
 def user_login(request):
 	msg = None
@@ -48,16 +48,16 @@ def user_login(request):
 		u = authenticate(username=username, password=password)
 		if u and u.is_active:
 			login(request, u)
-			redirect_url = request.GET.get('next') or '/leads/'
+			redirect_url = request.GET.get('next') or '/devs/'
 			return HttpResponseRedirect(redirect_url)
 		else:
 			msg = 'Invalid credentials or inactive account'
 		# context.form = userCredentialsForm
 	context = {'msg': msg}
-	return render(request, 'lead_center/login.html', context)
+	return render(request, 'dev_center/login.html', context)
 
 @login_required
-def lead_form(request, campaign_name='eartohear.info'):
+def dev_form(request, campaign_name='eartohear.info'):
 	campaign = None
 	try:
 		campaign = Campaign.objects.get(name=campaign_name)
@@ -65,50 +65,50 @@ def lead_form(request, campaign_name='eartohear.info'):
 	except Campaign.DoesNotExist:
 		pass  # do stuff
 
-	form = LeadForm(request.POST or None)
+	form = DevForm(request.POST or None)
 
-	context_dict = {'form': form, 'title': 'Create new lead'}
+	context_dict = {'form': form, 'title': 'Create new dev'}
 	if form.is_valid():
 		# do stuff
-		lead = form.save(commit=False)
-		lead.campaign = campaign
-		lead.save()
+		dev = form.save(commit=False)
+		dev.campaign = campaign
+		dev.save()
 		context_dict['success'] = True
 
-	return render(request, 'lead_center/lead_form.html', context_dict)
+	return render(request, 'dev_center/dev_form.html', context_dict)
 
 @login_required
-def lead_edit_form(request, lead_id):
-	leadData=None
+def dev_edit_form(request, dev_id):
+	devData=None
 	form=None
-	leadEdited=False
+	devEdited=False
 	notFound=False
 	title=None
 	try:
-		leadData = Lead.objects.get(id=lead_id)
-		print leadData.id
-	except Lead.DoesNotExist:
+		devData = Dev.objects.get(id=dev_id)
+		print devData.id
+	except Dev.DoesNotExist:
 		pass #pass
 
-	if leadData:
-		title = 'Edit lead - ' + leadData.first_name + ' ' + leadData.last_name
-		form = LeadForm(request.POST or None, instance=leadData)
+	if devData:
+		title = 'Edit dev - ' + devData.first_name + ' ' + devData.last_name
+		form = DevForm(request.POST or None, instance=devData)
 		if form.is_valid():
 			#save for and show success			
-			leadData.save()
+			devData.save()
 			form.save()
-			leadEdited = True
+			devEdited = True
 	else:
-		#no such lead
-		title = 'No such lead'
+		#no such dev
+		title = 'No such dev'
 		notFound = True
-	context_dict = {'title': title, 'notFound': notFound, 'leadEdited': leadEdited, 'form': form}
-	return render(request, 'lead_center/lead_form.html', context_dict)
+	context_dict = {'title': title, 'notFound': notFound, 'devEdited': devEdited, 'form': form}
+	return render(request, 'dev_center/dev_form.html', context_dict)
 
 @login_required
 def product_list(request):
 	productAdded = False
-	products = Product.objects.annotate(lead_count=Count('product_leads'))
+	products = Product.objects.annotate(dev_count=Count('product_devs'))
 	#products = = Product.objects.all()
 
 	form=ProductForm(request.POST or None)
@@ -117,7 +117,7 @@ def product_list(request):
 		product.save()
 		productAdded = True
 	context_dict = {'products': products, 'form': form, 'productAdded': productAdded, 'obj_type': 'Product'}
-	return render(request, 'lead_center/product_list.html', context_dict)
+	return render(request, 'dev_center/product_list.html', context_dict)
 
 @login_required
 def search_list(request):
@@ -130,13 +130,13 @@ def search_list(request):
 		model_class = Product
 		objStr = 'product'
 	elif object_type == 'Status':
-		model_class = LeadStatus
+		model_class = DevStatus
 		objStr = 'status'
-	elif object_type == 'Lead':
-		model_class = Lead
-		objStr = 'lead'
+	elif object_type == 'Dev':
+		model_class = Dev
+		objStr = 'dev'
 	result_set = model_class.objects.filter(name__icontains=query_string)
-	return render(request, 'lead_center/common/generic_list.html', {'obj': result_set, 'objStr': objStr})
+	return render(request, 'dev_center/common/generic_list.html', {'obj': result_set, 'objStr': objStr})
 	
 @login_required
 def delete_obj(request, obj_type, obj_id):
@@ -150,7 +150,7 @@ def delete_obj(request, obj_type, obj_id):
  		redirect_url = 'product_list'
  	elif obj_type == 'status':
  		title = 'Delete status?'
- 		model_class = LeadStatus
+ 		model_class = DevStatus
  		redirect_url = 'status_list'
  	else:
  		raise Http404
@@ -165,7 +165,7 @@ def delete_obj(request, obj_type, obj_id):
 		obj.delete()
 		return redirect(redirect_url)
 	
-	return render(request, 'lead_center/common/delete_obj.html', {'title': delete_obj, 'success': success, 'object': obj})
+	return render(request, 'dev_center/common/delete_obj.html', {'title': delete_obj, 'success': success, 'object': obj})
 
 
 @login_required
@@ -181,9 +181,9 @@ def edit_obj (request, obj_type, obj_id):
 		title = 'Edit product'
 		redirect_url = 'product_list'
 	elif obj_type == 'status':
-		model = LeadStatus
-		form_class = LeadStatusForm
-		title = 'Edit lead status'
+		model = DevStatus
+		form_class = DevStatusForm
+		title = 'Edit dev status'
 		redirect_url = 'status_list'
 	else:
 		raise Http404
@@ -199,43 +199,43 @@ def edit_obj (request, obj_type, obj_id):
 	if form.is_valid() and obj:
 		form.save()
 		return redirect(redirect_url)
-	return render(request, 'lead_center/common/edit_obj.html', {'title': title, 'formTitle': obj.name, 'form': form})
+	return render(request, 'dev_center/common/edit_obj.html', {'title': title, 'formTitle': obj.name, 'form': form})
 
 
 
 @login_required
 def campaign_list(request):
 	campaignAdded = False
-	campaigns = Campaign.objects.annotate(lead_count=Count('campaign_leads'))
+	campaigns = Campaign.objects.annotate(dev_count=Count('campaign_devs'))
 	#products = = Product.objects.all()
 	form=CampaignForm(request.POST or None)
 	if form.is_valid():
 		campaign = form.save()
 		campaignAdded = True
 	context_dict = {'campaigns': campaigns, 'form': form, 'campaignAdded': campaignAdded, 'obj_type': 'Campaign'}
-	return render(request, 'lead_center/campaign_list.html', context_dict)
+	return render(request, 'dev_center/campaign_list.html', context_dict)
 
 @login_required
 def status_list(request):
 	statusAdded = False
-	statuses = LeadStatus.objects.annotate(lead_count=Count('status_leads'))
+	statuses = DevStatus.objects.annotate(dev_count=Count('status_devs'))
 	#products = = Product.objects.all()
-	form=LeadStatusForm(request.POST or None)
+	form=DevStatusForm(request.POST or None)
 	if form.is_valid():
 		status = form.save()
 		statusAdded = True
 	context_dict = {'statuses': statuses, 'form': form, 'statusAdded': statusAdded, 'obj_type': 'Status'}
-	return render(request, 'lead_center/status_list.html', context_dict)
+	return render(request, 'dev_center/status_list.html', context_dict)
 
 
 @login_required
 def user_logout(request):
 	logout(request)
-	return HttpResponseRedirect('/leads/')
+	return HttpResponseRedirect('/devs/')
 	
 def index(request):
-	leads = Lead.objects.all().order_by('phone')
-	context_dict = {'leads': leads}
+	devs = Dev.objects.all().order_by('phone')
+	context_dict = {'devs': devs}
 	if request.session.has_key('last_visit'):
 		last_visit = request.session.get('last_visit')
 		visits = request.session.get('visits', 0)
@@ -245,24 +245,24 @@ def index(request):
 	else:
 		request.session['last_visit'] = str(datetime.now())
 		request.session['visits'] = 1
-	return render(request, 'lead_center/index.html', context_dict)
+	return render(request, 'dev_center/index.html', context_dict)
 
 @login_required
-def lead_page(request, lead_name=None):
-	split_name = lead_name.split('-')
-	leads = None
+def dev_page(request, dev_name=None):
+	split_name = dev_name.split('-')
+	devs = None
 	comment_list = None
 	comment_success = False
 
-	leads = Lead.objects.filter(first_name = split_name[0], last_name = split_name[1])
+	devs = Dev.objects.filter(first_name = split_name[0], last_name = split_name[1])
 
-	form = leadCommentForm(request.POST or None)
-	if leads:
-		comment_list = LeadComment.objects.filter(lead = leads[0])
-	if leads and form.is_valid():
+	form = DevCommentForm(request.POST or None)
+	if devs:
+		comment_list = DevComment.objects.filter(dev = devs[0])
+	if devs and form.is_valid():
 		comment = form.save(commit=False)
-		comment.lead = leads[0]#change this to many to many blat
+		comment.dev = devs[0]#change this to many to many blat
 		comment.save()
 		comment_success = True
-	context_dict = {'leads': leads, 'title': lead_name, 'form': form, 'comment_list': comment_list, 'comment_success': comment_success}
-	return render(request, 'lead_center/lead_page.html', context_dict)
\ No newline at end of file
+	context_dict = {'devs': devs, 'title': dev_name, 'form': form, 'comment_list': comment_list, 'comment_success': comment_success}
+	return render(request, 'dev_center/dev_page.html', context_dict)
\ No newline at end of file
diff --git a/karinacms/karinacms/settings.py b/karinacms/karinacms/settings.py
index e88f95b..88bfd2e 100644
--- a/karinacms/karinacms/settings.py
+++ b/karinacms/karinacms/settings.py
@@ -15,11 +15,11 @@
 PROJECT_PATH = os.path.join(SETTINGS_DIR, os.pardir)
 PROJECT_PATH = os.path.abspath(PROJECT_PATH)
 TEMPLATE_PATH = os.path.join(PROJECT_PATH, 'templates')
-TEMPLATE_PATH_LEADS = os.path.join(TEMPLATE_PATH, 'lead_center')
+TEMPLATE_PATH_LEADS = os.path.join(TEMPLATE_PATH, 'dev_center')
 TEMPLATE_PATH_LEADS_COMMON = os.path.join(TEMPLATE_PATH_LEADS, 'common')
 STATIC_PATH = os.path.join(PROJECT_PATH, 'static')
 STATIC_URL = '/static/'
-LOGIN_URL = '/leads/login/'
+LOGIN_URL = '/devs/login/'
 # Quick-start development settings - unsuitable for production
 # See https://docs.djangoproject.com/en/1.6/howto/deployment/checklist/
 
@@ -44,7 +44,7 @@
     'django.contrib.messages',
     'django.contrib.staticfiles',
     'south',
-    'lead_center',
+    'dev_center',
     'rest_framework',
 )
 
diff --git a/karinacms/karinacms/urls.py b/karinacms/karinacms/urls.py
index 1df5ef2..a94d82a 100644
--- a/karinacms/karinacms/urls.py
+++ b/karinacms/karinacms/urls.py
@@ -1,15 +1,15 @@
 from django.conf.urls import patterns, include, url
-from lead_center import views
+from dev_center import views
 from rest_framework import routers
 from django.contrib import admin
 
 admin.autodiscover()
 
 router = routers.DefaultRouter()
-router.register(r'leads', views.LeadViewSet)
+router.register(r'devs', views.DevViewSet)
 
 urlpatterns = patterns('',
-	url(r'^devs/', include('lead_center.urls')),
+	url(r'^devs/', include('dev_center.urls')),
     url(r'^admin/', include(admin.site.urls)),
     url(r'^api/', include(router.urls)),
     # url(r'^api/', include('rest_framework.urls', namespace='rest_framework')),
diff --git a/karinacms/lead_center/urls.py b/karinacms/lead_center/urls.py
deleted file mode 100644
index f12401c..0000000
--- a/karinacms/lead_center/urls.py
+++ /dev/null
@@ -1,23 +0,0 @@
-from django.conf.urls import patterns, include, url
-
-from django.contrib import admin
-from lead_center import views
-admin.autodiscover()
-
-urlpatterns = patterns('',
-    url(r'^$', 'lead_center.views.index', name='index'),
-    # url(r'^about/', 'lead_center.views.about', name='about'),
-    url(r'^add_lead/(?P<campaign_name>.+)?', 'lead_center.views.lead_form', name='add_lead'),
-    url(r'^edit_lead/(?P<lead_id>\d+)/$', 'lead_center.views.lead_edit_form', name='edit_lead'),
-    url(r'^lead_page/(?P<lead_name>.+)?', 'lead_center.views.lead_page', name='lead_page'),
-    url(r'^products/', 'lead_center.views.product_list', name='product_list'),
-    url(r'^campaigns/', 'lead_center.views.campaign_list', name='campaign_list'),
-    url(r'^statuses/', 'lead_center.views.status_list', name='status_list'),
-    # url(r'^blog/', includelead_center('blog.urls')),
-    url(r'^register/', 'lead_center.views.register', name='register'),#TODO: remove those paths to the root urls.py
-    url(r'^login/', 'lead_center.views.user_login', name='login'),
-    url(r'^logout/', 'lead_center.views.user_logout', name='logout'),
-    url(r'^search_list/$', 'lead_center.views.search_list', name='search_list'),
-    url(r'^edit/(?P<obj_type>.+)/(?P<obj_id>\d+)$', 'lead_center.views.edit_obj', name='edit_obj'),   #url(r'^admin/', include(admin.site.urls)),
-    url(r'^delete/(?P<obj_type>.+)/(?P<obj_id>\d+)$', 'lead_center.views.delete_obj', name='delete_obj'),
-)
\ No newline at end of file
diff --git a/karinacms/templates/lead_center/about.html b/karinacms/templates/dev_center/about.html
similarity index 65%
rename from karinacms/templates/lead_center/about.html
rename to karinacms/templates/dev_center/about.html
index 7067dc5..8f7d060 100644
--- a/karinacms/templates/lead_center/about.html
+++ b/karinacms/templates/dev_center/about.html
@@ -2,21 +2,21 @@
 {% load static %} 
 <html>
     <head>
-        <title>Lead management - about</title>
+        <title>Dev management - about</title>
     </head>
 
     <body>
         <h1>About the system</h1>
         <div>
             <p>
-                A simple system to track and manage leads from  different capmpagigns and landing pages.
+                A simple system to track and manage devs from  different capmpagigns and landing pages.
             </p>
         </div>
         <span style="font-weight:bold;">
         	{{ boldmessage }}
         </span>
         <br>
-        <a href="/leads/">Home</a>
+        <a href="/devs/">Home</a>
         <br>
         <img src={% static "campus.jpg" %} alt="campus">
     </body>
diff --git a/karinacms/templates/lead_center/campaign_list.html b/karinacms/templates/dev_center/campaign_list.html
similarity index 93%
rename from karinacms/templates/lead_center/campaign_list.html
rename to karinacms/templates/dev_center/campaign_list.html
index a4cbd82..dec5489 100644
--- a/karinacms/templates/lead_center/campaign_list.html
+++ b/karinacms/templates/dev_center/campaign_list.html
@@ -1,4 +1,4 @@
-{% extends "lead_center/common/base.html" %}
+{% extends "dev_center/common/base.html" %}
 {% block title %}Campaigns{% endblock %}
 {% block content %}
 <h1>Campaigns</h1>
@@ -15,7 +15,7 @@ <h1>Campaigns</h1>
 	        </div>
 
 	        <div class="col col-lg-3">
-	            Lead count 
+	            Dev count
 	        </div>
 	        <div class="col col-lg-3">
 	            Actions
diff --git a/karinacms/templates/lead_center/common/base.html b/karinacms/templates/dev_center/common/base.html
similarity index 96%
rename from karinacms/templates/lead_center/common/base.html
rename to karinacms/templates/dev_center/common/base.html
index 226d873..43d3ddd 100644
--- a/karinacms/templates/lead_center/common/base.html
+++ b/karinacms/templates/dev_center/common/base.html
@@ -3,7 +3,7 @@
 {% load static %}
     <head>
         <title>{% block title %}{% endblock %}</title>
-        <link rel="stylesheet" type="text/css" href="{% static 'leads.css' %}">
+        <link rel="stylesheet" type="text/css" href="{% static 'devs.css' %}">
         <link rel="stylesheet" type="text/css" href="{% static 'lib/bootstrap/css/bootstrap.min.css' %}">
         <script type="text/javascript" src="{% static 'lib/jquery/jquery.min.js' %}"></script>
         <script type="text/javascript" src="{% static 'lib/bootstrap/js/bootstrap.min.js' %}"></script>
@@ -11,13 +11,13 @@
         <script type="text/javascript" src="{% static 'assets/js/footer.js' %}"></script>
     </head>
     <body>
-    {% include "lead_center/common/header.html" %}
+    {% include "dev_center/common/header.html" %}
         <div class="col-lg-3">
             <div class="well">
             <h3>Options</h3>
                 <ul class="sidebar-nav"> 
                     <li>
-                        <a href="/devs/add_lead">
+                        <a href="/devs/add_dev">
                             Add new dev
                         </a>
                     </li>
diff --git a/karinacms/templates/lead_center/common/delete_obj.html b/karinacms/templates/dev_center/common/delete_obj.html
similarity index 100%
rename from karinacms/templates/lead_center/common/delete_obj.html
rename to karinacms/templates/dev_center/common/delete_obj.html
diff --git a/karinacms/templates/lead_center/common/edit_obj.html b/karinacms/templates/dev_center/common/edit_obj.html
similarity index 74%
rename from karinacms/templates/lead_center/common/edit_obj.html
rename to karinacms/templates/dev_center/common/edit_obj.html
index e1182b2..c445994 100644
--- a/karinacms/templates/lead_center/common/edit_obj.html
+++ b/karinacms/templates/dev_center/common/edit_obj.html
@@ -3,5 +3,5 @@
 {% block search %}{% endblock %}
 {% block content %}
 	<h1>{{title}}</h1>
-	{% include "lead_center/common/genericForm.html" %}
+	{% include "dev_center/common/genericForm.html" %}
 {% endblock %}
\ No newline at end of file
diff --git a/karinacms/templates/lead_center/common/genericForm.html b/karinacms/templates/dev_center/common/genericForm.html
similarity index 100%
rename from karinacms/templates/lead_center/common/genericForm.html
rename to karinacms/templates/dev_center/common/genericForm.html
diff --git a/karinacms/templates/lead_center/common/header.html b/karinacms/templates/dev_center/common/header.html
similarity index 84%
rename from karinacms/templates/lead_center/common/header.html
rename to karinacms/templates/dev_center/common/header.html
index 2897cc2..d423733 100644
--- a/karinacms/templates/lead_center/common/header.html
+++ b/karinacms/templates/dev_center/common/header.html
@@ -11,19 +11,19 @@
 	<ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
 		{% if user.is_authenticated %}
 			<li>
-				<a href="/leads/logout/"> 
+				<a href="/devs/logout/">
 					Logout
 				</a>
 			</li>
 		{% else %}
-	    	<a href="/leads/login/"> 
+	    	<a href="/devs/login/">
 	    		Login
 	    	</a>
 		{% endif %}
 	</ul>
 	</li>
 	<li>
-		<a href="/leads/"> 
+		<a href="/devs/">
 			Home
 		</a>
 	</li>
diff --git a/karinacms/templates/lead_center/lead_form.html b/karinacms/templates/dev_center/dev_form.html
similarity index 73%
rename from karinacms/templates/lead_center/lead_form.html
rename to karinacms/templates/dev_center/dev_form.html
index de926db..2368931 100644
--- a/karinacms/templates/lead_center/lead_form.html
+++ b/karinacms/templates/dev_center/dev_form.html
@@ -1,4 +1,4 @@
-{% extends "lead_center/common/base.html" %}
+{% extends "dev_center/common/base.html" %}
 {% block title %} {{title}} {% endblock %}
 {% block content %}
     <div>
@@ -11,13 +11,13 @@ <h1>{{title}}</h1>
     </div>
     <div>
         {% if form.is_valid %}
-            {% if leadEdited%}
+            {% if devEdited%}
                 <span lass="success">
-                    Lead edited successfully, thank you!
+                    Dev edited successfully, thank you!
                 </span>
             {% else %}
             <span lass="success">
-                Lead added successfully, thank you!
+                Dev added successfully, thank you!
             </span>
             {% endif %}
         {% endif %}
diff --git a/karinacms/templates/lead_center/lead_page.html b/karinacms/templates/dev_center/dev_page.html
similarity index 86%
rename from karinacms/templates/lead_center/lead_page.html
rename to karinacms/templates/dev_center/dev_page.html
index 1f449d3..e3daa1d 100644
--- a/karinacms/templates/lead_center/lead_page.html
+++ b/karinacms/templates/dev_center/dev_page.html
@@ -1,28 +1,28 @@
-{% extends "lead_center/common/base.html" %}
-{% block title %}Lead management - {{title}} {% endblock %}
+{% extends "dev_center/common/base.html" %}
+{% block title %}Dev management - {{title}} {% endblock %}
 {% block content %}
         <h1>{{title}}</h1>
-        {% if leads %}
-                {% for lead in leads %}
+        {% if devs %}
+                {% for dev in devs %}
                 <div class="row left">
                     <div style="font-weight:bold;" class="col-lg-3">
                         <div class="row left">
-                               <li>{{forloop.counter}}. First name:   {{lead.first_name}}</li>
+                               <li>{{forloop.counter}}. First name:   {{dev.first_name}}</li>
                         </div>
 
                         <div class="row left">
-                            Last name: {{lead.last_name}}
+                            Last name: {{dev.last_name}}
                         </div>
 
                         <div class="row left">
-                           Phone: {{lead.phone}}
+                           Phone: {{dev.phone}}
                         </div>
 
                         <div class="row left">
-                            Location:  {{lead.city}}
+                            Location:  {{dev.city}}
                         </div>
                         <div class="row left">
-                            <a href="/leads/edit_lead/{{lead.id}}" class="btn btn-link">
+                            <a href="/devs/edit_dev/{{dev.id}}" class="btn btn-link">
                                 Edit
                             </a>
                         </div>
diff --git a/karinacms/templates/lead_center/index.html b/karinacms/templates/dev_center/index.html
similarity index 77%
rename from karinacms/templates/lead_center/index.html
rename to karinacms/templates/dev_center/index.html
index df4ecc5..5b79c6f 100644
--- a/karinacms/templates/lead_center/index.html
+++ b/karinacms/templates/dev_center/index.html
@@ -1,7 +1,7 @@
-{% extends "lead_center/common/base.html" %}
+{% extends "dev_center/common/base.html" %}
 {% block content %}
         <h1>Devs database</h1>
-        {% if leads %}
+        {% if devs %}
             <div class="tbl">
                 <div style="font-weight:bold;" class="row">
                 	<div class="col col-lg-3">
@@ -20,24 +20,24 @@ <h1>Devs database</h1>
                         Location
                     </div>
                 </div>
-                {% for lead in leads %}
+                {% for dev in devs %}
                     <div style="font-weight:bold;" class="row">
                         <div class="col col-lg-3">
-                            <a href='lead_page/{{lead.first_name}}-{{lead.last_name}}'>
-                                {{lead.first_name}}
+                            <a href='dev_page/{{dev.first_name}}-{{dev.last_name}}'>
+                                {{dev.first_name}}
                             </a>
                         </div>
 
                         <div class="col col-lg-3">
-                            {{lead.last_name}}
+                            {{dev.last_name}}
                         </div>
 
                         <div class="col col-lg-3">
-                            {{lead.phone}}
+                            {{dev.phone}}
                         </div>
 
                         <div class="col col-lg-3">
-                            {{lead.city}}
+                            {{dev.city}}
                         </div>
                     </div>
                 {% endfor %}
diff --git a/karinacms/templates/lead_center/login.html b/karinacms/templates/dev_center/login.html
similarity index 92%
rename from karinacms/templates/lead_center/login.html
rename to karinacms/templates/dev_center/login.html
index 6b24326..bb33f1f 100644
--- a/karinacms/templates/lead_center/login.html
+++ b/karinacms/templates/dev_center/login.html
@@ -1,4 +1,4 @@
-{% extends "lead_center/common/base.html" %}
+{% extends "dev_center/common/base.html" %}
 {% block title %}Register{% endblock %}
 {% block content %}
 	{% if msg %}
@@ -37,7 +37,7 @@ <h4>Enter your credentials</h4>
 	</form>
 	<div class="row">
 		<div class="col col-lg-12">
-			<a href="/leads/register">
+			<a href="/devs/register">
 				Register
 			</a>
 		</div>
diff --git a/karinacms/templates/lead_center/product_list.html b/karinacms/templates/dev_center/product_list.html
similarity index 93%
rename from karinacms/templates/lead_center/product_list.html
rename to karinacms/templates/dev_center/product_list.html
index b7eefc4..8284043 100644
--- a/karinacms/templates/lead_center/product_list.html
+++ b/karinacms/templates/dev_center/product_list.html
@@ -1,4 +1,4 @@
-{% extends "lead_center/common/base.html" %}
+{% extends "dev_center/common/base.html" %}
 {% block title %}Products{% endblock %}
 {% block content %}
 <h1>Services</h1>
@@ -14,7 +14,7 @@ <h1>Services</h1>
 	            </div>
 
 	            <div class="col col-lg-3">
-	                Lead count 
+	                Dev count
 	            </div>
 	            <div class="col col-lg-3">
 	                Actions
diff --git a/karinacms/templates/lead_center/register.html b/karinacms/templates/dev_center/register.html
similarity index 81%
rename from karinacms/templates/lead_center/register.html
rename to karinacms/templates/dev_center/register.html
index 02969a9..1f62be5 100644
--- a/karinacms/templates/lead_center/register.html
+++ b/karinacms/templates/dev_center/register.html
@@ -1,10 +1,10 @@
-{% extends 'lead_center/common/base.html' %}
+{% extends 'dev_center/common/base.html' %}
 {% block title %}Register{% endblock %}
 {% block content %}
 		{% if registered %}
 			<div class="successMsg">
 				Thank you for registering, you can now 
-				<a href="/leads/login">Login!</a>
+				<a href="/devs/login">Login!</a>
 			<div>
 		{% else %}
 			<form method="POST" action="">
diff --git a/karinacms/templates/lead_center/status_list.html b/karinacms/templates/dev_center/status_list.html
similarity index 91%
rename from karinacms/templates/lead_center/status_list.html
rename to karinacms/templates/dev_center/status_list.html
index e3d739c..cb274eb 100644
--- a/karinacms/templates/lead_center/status_list.html
+++ b/karinacms/templates/dev_center/status_list.html
@@ -1,7 +1,7 @@
-{% extends "lead_center/common/base.html" %}
+{% extends "dev_center/common/base.html" %}
 {% block title %}Statuses{% endblock %}
 {% block content %}
-<h1>Lead statuses</h1>
+<h1>Dev statuses</h1>
 	{% if statuses %}
 	    <div class="tbl">
 	        <div style="font-weight:bold;" class="row">
@@ -14,7 +14,7 @@ <h1>Lead statuses</h1>
 	            </div>
 
 	            <div class="col col-lg-3">
-	                Lead count 
+	                Dev count
 	            </div>
 	            <div class="col col-lg-3">
 	                Actions

From e229fb48b4b37ae811add8979e890b8bd1555ee6 Mon Sep 17 00:00:00 2001
From: root <arana_lucas@hotmail.com>
Date: Mon, 14 Mar 2016 16:56:54 -0300
Subject: [PATCH 04/11] added generic_list and fields for new emails

---
 karinacms/dev_center/forms.py                 |  3 +-
 karinacms/dev_center/models.py                |  3 ++
 .../templates/dev_center/campaign_list.html   |  2 +-
 .../dev_center/common/genericForm.html        |  2 +-
 .../dev_center/common/generic_list.html       | 38 +++++++++++++++++++
 karinacms/templates/dev_center/dev_page.html  |  2 +-
 6 files changed, 46 insertions(+), 4 deletions(-)
 create mode 100644 karinacms/templates/dev_center/common/generic_list.html

diff --git a/karinacms/dev_center/forms.py b/karinacms/dev_center/forms.py
index 9dfe38b..169e531 100644
--- a/karinacms/dev_center/forms.py
+++ b/karinacms/dev_center/forms.py
@@ -47,7 +47,8 @@ class DevForm(BootstrapForm):
 	class Meta:
 		model = Dev
 		fields = ('first_name', 'last_name', 'city', 'phone',
-				 'email', 'comment', 'status', 'campaign', 'product')
+				 'email', 'comment', 'status', 'campaign', 'product',
+				  'asana', 'github', 'slack')
 
 
 class DevCommentForm(BootstrapForm):
diff --git a/karinacms/dev_center/models.py b/karinacms/dev_center/models.py
index 789a249..bdf4efc 100644
--- a/karinacms/dev_center/models.py
+++ b/karinacms/dev_center/models.py
@@ -35,6 +35,9 @@ class Dev(models.Model):
 	campaign_url = models.CharField(max_length=100, blank=True)
 	phone = models.CharField(max_length=15)
 	email = models.CharField(max_length=60, blank=True)
+	asana = models.CharField(max_length=60, blank=True)
+	github = models.CharField(max_length=60, blank=True)
+	slack = models.CharField(max_length=60, blank=True)
 	first_name = models.CharField(max_length=40)
 	last_name = models.CharField(max_length=40)
 	city = models.CharField(max_length=50, blank=True)
diff --git a/karinacms/templates/dev_center/campaign_list.html b/karinacms/templates/dev_center/campaign_list.html
index dec5489..f1bd94d 100644
--- a/karinacms/templates/dev_center/campaign_list.html
+++ b/karinacms/templates/dev_center/campaign_list.html
@@ -22,7 +22,7 @@ <h1>Campaigns</h1>
 	        </div>
 	    </div>
 		<div id="result_set">
-			{% include 'common/generic_list.html' with obj=campigns objStr="campaign" %}
+			{% include 'common/generic_list.html' with obj=campaigns objStr="campaign" %}
 		</div>
 	</div>
 	{% else %}
diff --git a/karinacms/templates/dev_center/common/genericForm.html b/karinacms/templates/dev_center/common/genericForm.html
index 9cd04a0..45a6c82 100644
--- a/karinacms/templates/dev_center/common/genericForm.html
+++ b/karinacms/templates/dev_center/common/genericForm.html
@@ -1,7 +1,7 @@
 {% load custom_filters %}
 <form method="POST" action="">
     {% csrf_token %}
-    {% if formTitlte %}
+    {% if formTitle %}
     	<div class="row">
     		<h3>{{formTitle}}</h3>
     	</div>
diff --git a/karinacms/templates/dev_center/common/generic_list.html b/karinacms/templates/dev_center/common/generic_list.html
new file mode 100644
index 0000000..198e64e
--- /dev/null
+++ b/karinacms/templates/dev_center/common/generic_list.html
@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+{% load custom_filters %}
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Generic Lists</title>
+    {% csrf_token %}
+</head>
+<body>
+
+{% if products %}
+{% for product in products %}
+    <div class="row">
+        <div class="col col-lg-3">{{product.name}}</div>
+        <div class="col col-lg-3">{{product.description}}</div>
+    </div>
+{% endfor %}
+
+{% elif campaigns %}
+{% for campaign in campaigns %}
+    <div class="row">
+        <div class="col col-lg-3">{{campaign.name}}</div>
+        <div class="col col-lg-3">{{campaign.description}}</div>
+    </div>
+{% endfor %}
+
+{% elif statuses %}
+{% for status in statuses %}
+    <div class="row">
+        <div class="col col-lg-3">{{status.name}}</div>
+        <div class="col col-lg-3">{{status.description}}</div>
+    </div>
+{% endfor %}
+
+
+{% endif %}
+</body>
+</html>
\ No newline at end of file
diff --git a/karinacms/templates/dev_center/dev_page.html b/karinacms/templates/dev_center/dev_page.html
index e3daa1d..9bf1064 100644
--- a/karinacms/templates/dev_center/dev_page.html
+++ b/karinacms/templates/dev_center/dev_page.html
@@ -83,7 +83,7 @@ <h1>{{title}}</h1>
                     <input type="submit" value="Comment" class="btn btn-primary">
                   </div>  
             </div>
-        </from>
+        </form>
         <br>
         {% if comment_success %}
             <div style="row">

From 0ba0ace5be4e00a91acb8f5a168f0e6aefa7f9ba Mon Sep 17 00:00:00 2001
From: root <arana_lucas@hotmail.com>
Date: Wed, 16 Mar 2016 12:06:28 -0300
Subject: [PATCH 05/11] added_automatic_github_invitation

---
 .../dev_center/migrations/0001_initial.py     |  36 +-
 karinacms/dev_center/migrations/0002_01.py    | 105 -----
 karinacms/dev_center/views.py                 | 435 +++++++++---------
 karinacms/karinacms/local_settings.py         |   0
 karinacms/karinacms/settings.py               |  13 +
 karinacms/requirements.txt                    |   1 +
 requirements.txt                              |   7 -
 7 files changed, 262 insertions(+), 335 deletions(-)
 delete mode 100644 karinacms/dev_center/migrations/0002_01.py
 create mode 100644 karinacms/karinacms/local_settings.py
 delete mode 100644 requirements.txt

diff --git a/karinacms/dev_center/migrations/0001_initial.py b/karinacms/dev_center/migrations/0001_initial.py
index ced5a6c..c07430c 100644
--- a/karinacms/dev_center/migrations/0001_initial.py
+++ b/karinacms/dev_center/migrations/0001_initial.py
@@ -44,18 +44,21 @@ def forwards(self, orm):
         # 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['dev_center.Campaign'], null=True)),
-            ('product', self.gf('django.db.models.fields.related.ForeignKey')(related_name='product_devs', null=True, to=orm['dev_center.Product'])),
-            ('status', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['dev_center.DevStatus'], 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'dev_center', ['Dev'])
 
@@ -137,25 +140,28 @@ def backwards(self, orm):
         },
         u'dev_center.dev': {
             'Meta': {'object_name': 'Dev'},
-            'agent': ('django.db.models.fields.CharField', [], {'max_length': '60', 'null': 'True'}),
-            'campaign': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['dev_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'}),
+            '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_devs'", 'null': 'True', 'to': u"orm['dev_center.Product']"}),
-            'status': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['dev_center.DevStatus']", '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'dev_center.devcomment': {
             'Meta': {'object_name': 'DevComment'},
             'comment': ('django.db.models.fields.TextField', [], {'max_length': '1024'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'dev': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['dev_center.Dev']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             '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']"})
diff --git a/karinacms/dev_center/migrations/0002_01.py b/karinacms/dev_center/migrations/0002_01.py
deleted file mode 100644
index 2dd4ff4..0000000
--- a/karinacms/dev_center/migrations/0002_01.py
+++ /dev/null
@@ -1,105 +0,0 @@
-# -*- coding: utf-8 -*-
-from south.utils import datetime_utils as datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        pass
-
-    def backwards(self, orm):
-        pass
-
-    models = {
-        u'auth.group': {
-            'Meta': {'object_name': 'Group'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-        },
-        u'auth.permission': {
-            'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
-            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        },
-        u'auth.user': {
-            'Meta': {'object_name': 'User'},
-            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
-        },
-        u'contenttypes.contenttype': {
-            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        },
-        u'lead_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'}),
-            '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'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'ip': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': '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'})
-        },
-        u'lead_center.leadcomment': {
-            'Meta': {'object_name': 'LeadComment'},
-            'comment': ('django.db.models.fields.TextField', [], {'max_length': '1024'}),
-            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'},
-            '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': {
-            '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': {
-            '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']
\ No newline at end of file
diff --git a/karinacms/dev_center/views.py b/karinacms/dev_center/views.py
index a1df8d0..e6e9418 100644
--- a/karinacms/dev_center/views.py
+++ b/karinacms/dev_center/views.py
@@ -1,18 +1,23 @@
 from django.shortcuts import render, redirect
-from django.contrib.auth.models import User
 from django.contrib.auth import authenticate, login, logout
 from django.contrib.auth.decorators import login_required
 from django.db.models import Count
 from .forms import DevForm, CampaignForm, DevCommentForm, UserForm, UserInfoForm, ProductForm, DevStatusForm
-from .models import Campaign, Dev, DevComment, DevStatus, UserInfo, Product
-from django.http import HttpResponseRedirect, HttpResponse
+from .models import Campaign, Dev, DevComment, DevStatus, Product
+from django.http import HttpResponseRedirect
 from datetime import datetime
-from django.conf import settings
 
 from rest_framework import viewsets, permissions
 from .serializers import DevSerializer
 from .custom_permissions import PostOnly
 
+from karinacms import settings
+import requests
+
+# import sys
+# sys.path.insert(0, '/path/to/application/app/folder')
+
+
 class DevViewSet(viewsets.ModelViewSet):
     """
     API endpoint that allows devs being viewed and edited
@@ -23,246 +28,260 @@ class DevViewSet(viewsets.ModelViewSet):
 
 
 def register(request):
-	registered = False
-	userForm = UserForm(request.POST or None)
-	userInfoForm = UserInfoForm(request.POST or None)
-	if userForm.is_valid() and userInfoForm.is_valid():
-		user = userForm.save()
-		user.set_password(user.password)
-		user.save()
-		userInfo = userInfoForm.save(commit=False)
-		userInfo.user = user
-		userInfo.save()
-		registered = True
-	
-	context = {'userForm': userForm, 'userInfoForm': userInfoForm, 'registered': registered}
-	return render(request, 'dev_center/register.html', context)
+    registered = False
+    userForm = UserForm(request.POST or None)
+    userInfoForm = UserInfoForm(request.POST or None)
+    if userForm.is_valid() and userInfoForm.is_valid():
+        user = userForm.save()
+        user.set_password(user.password)
+        user.save()
+        userInfo = userInfoForm.save(commit=False)
+        userInfo.user = user
+        userInfo.save()
+        registered = True
+
+    context = {'userForm': userForm, 'userInfoForm': userInfoForm, 'registered': registered}
+    return render(request, 'dev_center/register.html', context)
+
 
 def user_login(request):
-	msg = None
-	next = None
-
-	if request.method == 'POST':
-		username = request.POST['username'];
-		password = request.POST['password'];
-		u = authenticate(username=username, password=password)
-		if u and u.is_active:
-			login(request, u)
-			redirect_url = request.GET.get('next') or '/devs/'
-			return HttpResponseRedirect(redirect_url)
-		else:
-			msg = 'Invalid credentials or inactive account'
-		# context.form = userCredentialsForm
-	context = {'msg': msg}
-	return render(request, 'dev_center/login.html', context)
+    msg = None
+    next = None
+
+    if request.method == 'POST':
+        username = request.POST['username'];
+        password = request.POST['password'];
+        u = authenticate(username=username, password=password)
+        if u and u.is_active:
+            login(request, u)
+            redirect_url = request.GET.get('next') or '/devs/'
+            return HttpResponseRedirect(redirect_url)
+        else:
+            msg = 'Invalid credentials or inactive account'
+        # context.form = userCredentialsForm
+    context = {'msg': msg}
+    return render(request, 'dev_center/login.html', context)
+
+
+def send_github_invitation(user):
+    r = requests.put(settings.API_GITHUB_URL + settings.GIT_ADD_MEMBERSHIP + user,
+                     auth=(settings.GIT_USER, settings.GIT_ACCESS_TOKEN))
+    return r
 
 @login_required
 def dev_form(request, campaign_name='eartohear.info'):
-	campaign = None
-	try:
-		campaign = Campaign.objects.get(name=campaign_name)
-		print campaign
-	except Campaign.DoesNotExist:
-		pass  # do stuff
+    campaign = None
+    try:
+        campaign = Campaign.objects.get(name=campaign_name)
+        print campaign
+    except Campaign.DoesNotExist:
+        pass  # do stuff
+
+    form = DevForm(request.POST or None)
 
-	form = DevForm(request.POST or None)
+    context_dict = {'form': form, 'title': 'Create new dev'}
+    if form.is_valid():
+        # do stuff
+        dev = form.save(commit=False)
+        dev.campaign = campaign
+        dev.save()
+        context_dict['success'] = True
+        response = send_github_invitation(dev.github) if dev.github else None
 
-	context_dict = {'form': form, 'title': 'Create new dev'}
-	if form.is_valid():
-		# do stuff
-		dev = form.save(commit=False)
-		dev.campaign = campaign
-		dev.save()
-		context_dict['success'] = True
+    return render(request, 'dev_center/dev_form.html', context_dict)
 
-	return render(request, 'dev_center/dev_form.html', context_dict)
 
 @login_required
 def dev_edit_form(request, dev_id):
-	devData=None
-	form=None
-	devEdited=False
-	notFound=False
-	title=None
-	try:
-		devData = Dev.objects.get(id=dev_id)
-		print devData.id
-	except Dev.DoesNotExist:
-		pass #pass
-
-	if devData:
-		title = 'Edit dev - ' + devData.first_name + ' ' + devData.last_name
-		form = DevForm(request.POST or None, instance=devData)
-		if form.is_valid():
-			#save for and show success			
-			devData.save()
-			form.save()
-			devEdited = True
-	else:
-		#no such dev
-		title = 'No such dev'
-		notFound = True
-	context_dict = {'title': title, 'notFound': notFound, 'devEdited': devEdited, 'form': form}
-	return render(request, 'dev_center/dev_form.html', context_dict)
+    devData=None
+    form=None
+    devEdited=False
+    notFound=False
+    title=None
+    try:
+        devData = Dev.objects.get(id=dev_id)
+        github = devData.github
+    except Dev.DoesNotExist:
+        pass #pass
+
+    if devData:
+        title = 'Edit dev - ' + devData.first_name + ' ' + devData.last_name
+        form = DevForm(request.POST or None, instance=devData)
+        if form.is_valid():
+            #save for and show success
+            devData.save()
+            form.save()
+            devEdited = True
+            response = send_github_invitation(devData.github) if devData.github != github else None
+    else:
+        #no such dev
+        title = 'No such dev'
+        notFound = True
+    context_dict = {'title': title, 'notFound': notFound, 'devEdited': devEdited, 'form': form}
+    return render(request, 'dev_center/dev_form.html', context_dict)
+
 
 @login_required
 def product_list(request):
-	productAdded = False
-	products = Product.objects.annotate(dev_count=Count('product_devs'))
-	#products = = Product.objects.all()
-
-	form=ProductForm(request.POST or None)
-	if form.is_valid():
-		product = form.save()
-		product.save()
-		productAdded = True
-	context_dict = {'products': products, 'form': form, 'productAdded': productAdded, 'obj_type': 'Product'}
-	return render(request, 'dev_center/product_list.html', context_dict)
+    productAdded = False
+    products = Product.objects.annotate(dev_count=Count('product_devs'))
+    #products = = Product.objects.all()
+
+    form=ProductForm(request.POST or None)
+    if form.is_valid():
+        product = form.save()
+        product.save()
+        productAdded = True
+    context_dict = {'products': products, 'form': form, 'productAdded': productAdded, 'obj_type': 'Product'}
+    return render(request, 'dev_center/product_list.html', context_dict)
+
 
 @login_required
 def search_list(request):
-	object_type = request.GET['object_type']
-	query_string = request.GET['query_string']
-	if object_type == 'Campaign':
-		model_class = Campaign
-		objStr = 'campaign'
-	elif object_type == 'Product':
-		model_class = Product
-		objStr = 'product'
-	elif object_type == 'Status':
-		model_class = DevStatus
-		objStr = 'status'
-	elif object_type == 'Dev':
-		model_class = Dev
-		objStr = 'dev'
-	result_set = model_class.objects.filter(name__icontains=query_string)
-	return render(request, 'dev_center/common/generic_list.html', {'obj': result_set, 'objStr': objStr})
-	
+    object_type = request.GET['object_type']
+    query_string = request.GET['query_string']
+    if object_type == 'Campaign':
+        model_class = Campaign
+        objStr = 'campaign'
+    elif object_type == 'Product':
+        model_class = Product
+        objStr = 'product'
+    elif object_type == 'Status':
+        model_class = DevStatus
+        objStr = 'status'
+    elif object_type == 'Dev':
+        model_class = Dev
+        objStr = 'dev'
+    result_set = model_class.objects.filter(name__icontains=query_string)
+    return render(request, 'dev_center/common/generic_list.html', {'obj': result_set, 'objStr': objStr})
+
+
 @login_required
 def delete_obj(request, obj_type, obj_id):
-	if obj_type == 'campaign':
-		title = 'Delete campagign?'
-		model_class = Campaign
-		redirect_url = 'campaign_list' 
-	elif obj_type == 'product':
- 		title = 'Delete product?'
- 		model_class = Product
- 		redirect_url = 'product_list'
- 	elif obj_type == 'status':
- 		title = 'Delete status?'
- 		model_class = DevStatus
- 		redirect_url = 'status_list'
- 	else:
- 		raise Http404
-
-	success = None
-	try:
-		obj = model_class.objects.get(pk=obj_id)
-	except (Campaign.DoesNotExist, Product.DoesNotExist):
-		raise Http404
-
-	if request.method == "POST" and obj:
-		obj.delete()
-		return redirect(redirect_url)
-	
-	return render(request, 'dev_center/common/delete_obj.html', {'title': delete_obj, 'success': success, 'object': obj})
+    if obj_type == 'campaign':
+        title = 'Delete campagign?'
+        model_class = Campaign
+        redirect_url = 'campaign_list'
+    elif obj_type == 'product':
+        title = 'Delete product?'
+        model_class = Product
+        redirect_url = 'product_list'
+    elif obj_type == 'status':
+        title = 'Delete status?'
+        model_class = DevStatus
+        redirect_url = 'status_list'
+    else:
+        raise Http404
+
+    success = None
+    try:
+        obj = model_class.objects.get(pk=obj_id)
+    except (Campaign.DoesNotExist, Product.DoesNotExist):
+        raise Http404
+
+    if request.method == "POST" and obj:
+        obj.delete()
+        return redirect(redirect_url)
+
+    return render(request, 'dev_center/common/delete_obj.html', {'title': delete_obj, 'success': success, 'object': obj})
 
 
 @login_required
 def edit_obj (request, obj_type, obj_id):
-	if obj_type == 'campaign':
-		model = Campaign
-		form_class = CampaignForm
-		title = 'Edit campaign'
-		redirect_url = 'campaign_list'
-	elif obj_type == 'product':
-		model = Product
-		form_class = ProductForm
-		title = 'Edit product'
-		redirect_url = 'product_list'
-	elif obj_type == 'status':
-		model = DevStatus
-		form_class = DevStatusForm
-		title = 'Edit dev status'
-		redirect_url = 'status_list'
-	else:
-		raise Http404
-
-	success = None
-	try:
-		obj = model.objects.get(pk=obj_id)
-	except model.DoesNotExist:
-		raise Http404
-
-	form = form_class(request.POST or None, instance=obj)
-	
-	if form.is_valid() and obj:
-		form.save()
-		return redirect(redirect_url)
-	return render(request, 'dev_center/common/edit_obj.html', {'title': title, 'formTitle': obj.name, 'form': form})
+    if obj_type == 'campaign':
+        model = Campaign
+        form_class = CampaignForm
+        title = 'Edit campaign'
+        redirect_url = 'campaign_list'
+    elif obj_type == 'product':
+        model = Product
+        form_class = ProductForm
+        title = 'Edit product'
+        redirect_url = 'product_list'
+    elif obj_type == 'status':
+        model = DevStatus
+        form_class = DevStatusForm
+        title = 'Edit dev status'
+        redirect_url = 'status_list'
+    else:
+        raise Http404
+
+    success = None
+    try:
+        obj = model.objects.get(pk=obj_id)
+    except model.DoesNotExist:
+        raise Http404
 
+    form = form_class(request.POST or None, instance=obj)
+
+    if form.is_valid() and obj:
+        form.save()
+        return redirect(redirect_url)
+    return render(request, 'dev_center/common/edit_obj.html', {'title': title, 'formTitle': obj.name, 'form': form})
 
 
 @login_required
 def campaign_list(request):
-	campaignAdded = False
-	campaigns = Campaign.objects.annotate(dev_count=Count('campaign_devs'))
-	#products = = Product.objects.all()
-	form=CampaignForm(request.POST or None)
-	if form.is_valid():
-		campaign = form.save()
-		campaignAdded = True
-	context_dict = {'campaigns': campaigns, 'form': form, 'campaignAdded': campaignAdded, 'obj_type': 'Campaign'}
-	return render(request, 'dev_center/campaign_list.html', context_dict)
+    campaignAdded = False
+    campaigns = Campaign.objects.annotate(dev_count=Count('campaign_devs'))
+    #products = = Product.objects.all()
+    form=CampaignForm(request.POST or None)
+    if form.is_valid():
+        campaign = form.save()
+        campaignAdded = True
+    context_dict = {'campaigns': campaigns, 'form': form, 'campaignAdded': campaignAdded, 'obj_type': 'Campaign'}
+    return render(request, 'dev_center/campaign_list.html', context_dict)
+
 
 @login_required
 def status_list(request):
-	statusAdded = False
-	statuses = DevStatus.objects.annotate(dev_count=Count('status_devs'))
-	#products = = Product.objects.all()
-	form=DevStatusForm(request.POST or None)
-	if form.is_valid():
-		status = form.save()
-		statusAdded = True
-	context_dict = {'statuses': statuses, 'form': form, 'statusAdded': statusAdded, 'obj_type': 'Status'}
-	return render(request, 'dev_center/status_list.html', context_dict)
+    statusAdded = False
+    statuses = DevStatus.objects.annotate(dev_count=Count('status_devs'))
+    #products = = Product.objects.all()
+    form=DevStatusForm(request.POST or None)
+    if form.is_valid():
+        status = form.save()
+        statusAdded = True
+    context_dict = {'statuses': statuses, 'form': form, 'statusAdded': statusAdded, 'obj_type': 'Status'}
+    return render(request, 'dev_center/status_list.html', context_dict)
 
 
 @login_required
 def user_logout(request):
-	logout(request)
-	return HttpResponseRedirect('/devs/')
-	
+    logout(request)
+    return HttpResponseRedirect('/devs/')
+
 def index(request):
-	devs = Dev.objects.all().order_by('phone')
-	context_dict = {'devs': devs}
-	if request.session.has_key('last_visit'):
-		last_visit = request.session.get('last_visit')
-		visits = request.session.get('visits', 0)
-		if(datetime.now() - datetime.strptime(last_visit[:-7], "%Y-%m-%d %H:%M:%S")).days > 0:
-			request.session['last_visit'] = str(datetime.now())	
-			request.session['visits'] = visits + 1
-	else:
-		request.session['last_visit'] = str(datetime.now())
-		request.session['visits'] = 1
-	return render(request, 'dev_center/index.html', context_dict)
+    devs = Dev.objects.all().order_by('phone')
+    context_dict = {'devs': devs}
+    if request.session.has_key('last_visit'):
+        last_visit = request.session.get('last_visit')
+        visits = request.session.get('visits', 0)
+        if(datetime.now() - datetime.strptime(last_visit[:-7], "%Y-%m-%d %H:%M:%S")).days > 0:
+            request.session['last_visit'] = str(datetime.now())
+            request.session['visits'] = visits + 1
+    else:
+        request.session['last_visit'] = str(datetime.now())
+        request.session['visits'] = 1
+    return render(request, 'dev_center/index.html', context_dict)
+
 
 @login_required
 def dev_page(request, dev_name=None):
-	split_name = dev_name.split('-')
-	devs = None
-	comment_list = None
-	comment_success = False
-
-	devs = Dev.objects.filter(first_name = split_name[0], last_name = split_name[1])
-
-	form = DevCommentForm(request.POST or None)
-	if devs:
-		comment_list = DevComment.objects.filter(dev = devs[0])
-	if devs and form.is_valid():
-		comment = form.save(commit=False)
-		comment.dev = devs[0]#change this to many to many blat
-		comment.save()
-		comment_success = True
-	context_dict = {'devs': devs, 'title': dev_name, 'form': form, 'comment_list': comment_list, 'comment_success': comment_success}
-	return render(request, 'dev_center/dev_page.html', context_dict)
\ No newline at end of file
+    split_name = dev_name.split('-')
+    devs = None
+    comment_list = None
+    comment_success = False
+
+    devs = Dev.objects.filter(first_name = split_name[0], last_name = split_name[1])
+
+    form = DevCommentForm(request.POST or None)
+    if devs:
+        comment_list = DevComment.objects.filter(dev = devs[0])
+    if devs and form.is_valid():
+        comment = form.save(commit=False)
+        comment.dev = devs[0]#change this to many to many blat
+        comment.save()
+        comment_success = True
+    context_dict = {'devs': devs, 'title': dev_name, 'form': form, 'comment_list': comment_list, 'comment_success': comment_success}
+    return render(request, 'dev_center/dev_page.html', context_dict)
diff --git a/karinacms/karinacms/local_settings.py b/karinacms/karinacms/local_settings.py
new file mode 100644
index 0000000..e69de29
diff --git a/karinacms/karinacms/settings.py b/karinacms/karinacms/settings.py
index 88bfd2e..bca845f 100644
--- a/karinacms/karinacms/settings.py
+++ b/karinacms/karinacms/settings.py
@@ -113,3 +113,16 @@
 # https://docs.djangoproject.com/en/1.6/howto/static-files/
 
 STATIC_URL = '/static/'
+
+
+# Github Credentials
+API_GITHUB_URL = 'https://api.github.com/'
+GIT_ADD_MEMBERSHIP = 'teams/1933218/memberships/'
+GIT_USER = ''
+GIT_ACCESS_TOKEN = ''
+
+
+try:
+    from local_settings import *
+except ImportError:
+    pass
diff --git a/karinacms/requirements.txt b/karinacms/requirements.txt
index b81b2b3..0252a9a 100644
--- a/karinacms/requirements.txt
+++ b/karinacms/requirements.txt
@@ -6,3 +6,4 @@ argparse==1.2.1
 distribute==0.6.24
 djangorestframework==2.3.10
 wsgiref==0.1.2
+requests
diff --git a/requirements.txt b/requirements.txt
deleted file mode 100644
index c3045c5..0000000
--- a/requirements.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-Django==1.6
-#PIL==1.1.7
-South==0.8.4
-argparse==1.2.1
-distribute==0.6.24
-djangorestframework==2.3.10
-wsgiref==0.1.2

From 3075f52b1e76089738462f595411219ad7e1d872 Mon Sep 17 00:00:00 2001
From: root <arana_lucas@hotmail.com>
Date: Wed, 16 Mar 2016 17:33:32 -0300
Subject: [PATCH 06/11] asana_integration_added

---
 karinacms/dev_center/views.py   | 8 ++++++--
 karinacms/karinacms/settings.py | 3 +++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/karinacms/dev_center/views.py b/karinacms/dev_center/views.py
index e6e9418..446a6ce 100644
--- a/karinacms/dev_center/views.py
+++ b/karinacms/dev_center/views.py
@@ -86,8 +86,12 @@ def dev_form(request, campaign_name='eartohear.info'):
         dev.campaign = campaign
         dev.save()
         context_dict['success'] = True
-        response = send_github_invitation(dev.github) if dev.github else None
-
+        git_response = send_github_invitation(dev.github) if dev.github else None
+        print git_response, git_response.json()
+        asana_response = requests.post(settings.API_ASANA_URL + settings.ASANA_WORKSPACES,
+                                       data={'user': 'arana_lucas@hotmail.com'},
+                                       headers={'Authorization': 'Bearer %s' % settings.ASANA_ACCESS_TOKEN})
+        #print asana_response, asana_response.json()
     return render(request, 'dev_center/dev_form.html', context_dict)
 
 
diff --git a/karinacms/karinacms/settings.py b/karinacms/karinacms/settings.py
index bca845f..ae08540 100644
--- a/karinacms/karinacms/settings.py
+++ b/karinacms/karinacms/settings.py
@@ -121,6 +121,9 @@
 GIT_USER = ''
 GIT_ACCESS_TOKEN = ''
 
+# Asana Credentials
+API_ASANA_URL = 'https://app.asana.com/api/1.0/'
+ASANA_WORKSPACES = 'workspaces/41767545824401/addUser'
 
 try:
     from local_settings import *

From 87be0bfdf2d9e689372b97266bc358a351c296ec Mon Sep 17 00:00:00 2001
From: root <arana_lucas@hotmail.com>
Date: Thu, 17 Mar 2016 16:22:12 -0300
Subject: [PATCH 07/11] add_delete_asana_git_finished

---
 karinacms/dev_center/views.py   | 77 +++++++++++++++++++++++++++++----
 karinacms/karinacms/settings.py |  6 ++-
 2 files changed, 73 insertions(+), 10 deletions(-)

diff --git a/karinacms/dev_center/views.py b/karinacms/dev_center/views.py
index 446a6ce..52225cb 100644
--- a/karinacms/dev_center/views.py
+++ b/karinacms/dev_center/views.py
@@ -13,6 +13,7 @@
 
 from karinacms import settings
 import requests
+import json
 
 # import sys
 # sys.path.insert(0, '/path/to/application/app/folder')
@@ -63,11 +64,72 @@ def user_login(request):
     return render(request, 'dev_center/login.html', context)
 
 
+def set_admin_permissions(devData, github, asana):
+        workspaces = get_asana_workspaces()
+        send_github_invitation(devData.github) if devData.github != github or devData.status.name != 'inactive' else None
+        send_asana_invitation(devData.asana, workspaces) if devData.asana != asana or devData.status.name != 'inactive' else None
+        revoke_github_permissions(devData.github) if devData.status.name == 'inactive' else None
+        revoke_asana_permissions(devData.asana, workspaces) if devData.status.name == 'inactive' else None
+
+
 def send_github_invitation(user):
-    r = requests.put(settings.API_GITHUB_URL + settings.GIT_ADD_MEMBERSHIP + user,
+    # Sends a github invitation to the Team to the selected User.
+    # User MUST be a username. Can't be an email.
+
+    r = requests.put(settings.API_GITHUB_URL + settings.GIT_MEMBERSHIP + user,
                      auth=(settings.GIT_USER, settings.GIT_ACCESS_TOKEN))
     return r
 
+
+def revoke_github_permissions(user):
+    # If the user is set to inactive, permissions to the user are denied
+
+    r = requests.delete(settings.API_GITHUB_URL + settings.GIT_MEMBERSHIP + user,
+                        auth=(settings.GIT_USER, settings.GIT_ACCESS_TOKEN))
+
+    return r
+
+
+def get_asana_workspaces():
+    # Gets all projects available
+    # Todo: Selectable project invitation.
+
+    work_r = requests.get(settings.API_ASANA_URL + settings.ASANA_WORKSPACES,
+                          headers={'Authorization': 'Bearer %s' % settings.ASANA_ACCESS_TOKEN})
+
+    work = json.loads(work_r.text)
+    workspaces = [str(i['id']) for i in work['data']]
+
+    return workspaces
+
+
+def send_asana_invitation(user, workspaces):
+    # Sends an invitation to each of the available workspaces.
+
+    responses = []
+    for i in workspaces:
+        r = requests.post(settings.API_ASANA_URL + settings.ASANA_WORKSPACES + i + settings.ASANA_ADD_USER,
+                          data={'user': user},
+                          headers={'Authorization': 'Bearer %s' % settings.ASANA_ACCESS_TOKEN})
+        responses.append(r)
+
+    return responses
+
+
+def revoke_asana_permissions(user, workspaces):
+    # If the user is set to inactive, permissions to the user are denied
+
+    responses = []
+    for i in workspaces:
+        r = requests.post(settings.API_ASANA_URL + settings.ASANA_WORKSPACES + i + settings.ASANA_DELETE_USER,
+                          data={'user': user},
+                          headers={'Authorization': 'Bearer %s' % settings.ASANA_ACCESS_TOKEN})
+        responses.append(r)
+
+    return responses
+
+
+
 @login_required
 def dev_form(request, campaign_name='eartohear.info'):
     campaign = None
@@ -87,11 +149,9 @@ def dev_form(request, campaign_name='eartohear.info'):
         dev.save()
         context_dict['success'] = True
         git_response = send_github_invitation(dev.github) if dev.github else None
-        print git_response, git_response.json()
-        asana_response = requests.post(settings.API_ASANA_URL + settings.ASANA_WORKSPACES,
-                                       data={'user': 'arana_lucas@hotmail.com'},
-                                       headers={'Authorization': 'Bearer %s' % settings.ASANA_ACCESS_TOKEN})
-        #print asana_response, asana_response.json()
+        asana_responses = send_asana_invitation(dev.asana) if dev.asana else None
+        # Todo: Show if exceptions appear/success
+
     return render(request, 'dev_center/dev_form.html', context_dict)
 
 
@@ -104,11 +164,12 @@ def dev_edit_form(request, dev_id):
     title=None
     try:
         devData = Dev.objects.get(id=dev_id)
-        github = devData.github
     except Dev.DoesNotExist:
         pass #pass
 
     if devData:
+        github = devData.github
+        asana = devData.asana
         title = 'Edit dev - ' + devData.first_name + ' ' + devData.last_name
         form = DevForm(request.POST or None, instance=devData)
         if form.is_valid():
@@ -116,7 +177,7 @@ def dev_edit_form(request, dev_id):
             devData.save()
             form.save()
             devEdited = True
-            response = send_github_invitation(devData.github) if devData.github != github else None
+            set_admin_permissions(devData, github, asana)
     else:
         #no such dev
         title = 'No such dev'
diff --git a/karinacms/karinacms/settings.py b/karinacms/karinacms/settings.py
index ae08540..b6059c8 100644
--- a/karinacms/karinacms/settings.py
+++ b/karinacms/karinacms/settings.py
@@ -117,13 +117,15 @@
 
 # Github Credentials
 API_GITHUB_URL = 'https://api.github.com/'
-GIT_ADD_MEMBERSHIP = 'teams/1933218/memberships/'
+GIT_MEMBERSHIP = 'orgs/onitsoft/memberships/'
 GIT_USER = ''
 GIT_ACCESS_TOKEN = ''
 
 # Asana Credentials
 API_ASANA_URL = 'https://app.asana.com/api/1.0/'
-ASANA_WORKSPACES = 'workspaces/41767545824401/addUser'
+ASANA_WORKSPACES = 'workspaces/'
+ASANA_ADD_USER = '/addUser/'
+ASANA_DELETE_USER = '/removeUser/'
 
 try:
     from local_settings import *

From 2b7a9bc423954a0ddfcd19256fc982290f2c9c21 Mon Sep 17 00:00:00 2001
From: root <arana_lucas@hotmail.com>
Date: Mon, 21 Mar 2016 10:37:22 -0300
Subject: [PATCH 08/11] trying_timetag_#time 4h30m

---
 karinacms/dev_center/forms.py                 |   7 +-
 .../migrations/0002_auto__add_devhours.py     | 127 ++++++++++++++++++
 karinacms/dev_center/models.py                |   8 ++
 karinacms/dev_center/urls.py                  |   1 +
 karinacms/dev_center/views.py                 |  57 ++++++--
 .../templates/dev_center/common/base.html     |   5 +
 .../templates/dev_center/hours_list.html      |  44 ++++++
 7 files changed, 240 insertions(+), 9 deletions(-)
 create mode 100644 karinacms/dev_center/migrations/0002_auto__add_devhours.py
 create mode 100644 karinacms/templates/dev_center/hours_list.html

diff --git a/karinacms/dev_center/forms.py b/karinacms/dev_center/forms.py
index 169e531..fa466f8 100644
--- a/karinacms/dev_center/forms.py
+++ b/karinacms/dev_center/forms.py
@@ -1,6 +1,6 @@
 from django import forms
 from django.contrib.auth.models import User
-from .models import Dev, Campaign, DevComment, DevStatus, UserInfo, Product
+from .models import Dev, Campaign, DevComment, DevStatus, UserInfo, Product, DevHours
 
 class BootstrapForm(forms.ModelForm):
 	def __init__(self, *args, **kwargs):
@@ -31,6 +31,11 @@ class Meta:
 		model = Campaign
 		fields = ('name', 'description',)
 
+class DevHoursForm(BootstrapForm):
+	class Meta:
+		model = DevHours
+		fields = ('dev', 'product',)
+
 class DevStatusForm(BootstrapForm):
 	class Meta:
 		model = DevStatus
diff --git a/karinacms/dev_center/migrations/0002_auto__add_devhours.py b/karinacms/dev_center/migrations/0002_auto__add_devhours.py
new file mode 100644
index 0000000..a6f8528
--- /dev/null
+++ b/karinacms/dev_center/migrations/0002_auto__add_devhours.py
@@ -0,0 +1,127 @@
+# -*- coding: utf-8 -*-
+from south.utils import datetime_utils as datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Adding model 'DevHours'
+        db.create_table(u'dev_center_devhours', (
+            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('dev', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['dev_center.Dev'])),
+            ('since', self.gf('django.db.models.fields.DateTimeField')(auto_now=True, blank=True)),
+            ('until', self.gf('django.db.models.fields.DateTimeField')(auto_now=True, blank=True)),
+            ('product', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['dev_center.Product'])),
+        ))
+        db.send_create_signal(u'dev_center', ['DevHours'])
+
+
+    def backwards(self, orm):
+        # Deleting model 'DevHours'
+        db.delete_table(u'dev_center_devhours')
+
+
+    models = {
+        u'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        u'auth.permission': {
+            'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        u'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        u'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        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'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', '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', [], {'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'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'}),
+            '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'dev_center.devhours': {
+            'Meta': {'object_name': 'DevHours'},
+            'dev': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['dev_center.Dev']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'product': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['dev_center.Product']"}),
+            'since': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'until': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'})
+        },
+        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'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'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 = ['dev_center']
\ No newline at end of file
diff --git a/karinacms/dev_center/models.py b/karinacms/dev_center/models.py
index bdf4efc..73e77f6 100644
--- a/karinacms/dev_center/models.py
+++ b/karinacms/dev_center/models.py
@@ -57,3 +57,11 @@ class DevComment(models.Model):
 	time = models.DateTimeField(auto_now=True)
 	# admin_id = models.ForeignKey(Users.user)
 
+
+class DevHours(models.Model):
+	dev = models.ForeignKey(Dev)
+	since = models.DateField(auto_now=True)
+	until = models.DateField(auto_now=True)
+	product = models.ForeignKey(Product)
+	def __unicode__(self):
+		return self.dev
\ No newline at end of file
diff --git a/karinacms/dev_center/urls.py b/karinacms/dev_center/urls.py
index a642c5f..ef8f3f1 100644
--- a/karinacms/dev_center/urls.py
+++ b/karinacms/dev_center/urls.py
@@ -13,6 +13,7 @@
     url(r'^products/', 'dev_center.views.product_list', name='product_list'),
     url(r'^campaigns/', 'dev_center.views.campaign_list', name='campaign_list'),
     url(r'^statuses/', 'dev_center.views.status_list', name='status_list'),
+    url(r'^hours/', 'dev_center.views.hours_list', name='hours_list'),
     # url(r'^blog/', includedev_center('blog.urls')),
     url(r'^register/', 'dev_center.views.register', name='register'),#TODO: remove those paths to the root urls.py
     url(r'^login/', 'dev_center.views.user_login', name='login'),
diff --git a/karinacms/dev_center/views.py b/karinacms/dev_center/views.py
index 52225cb..9056eaf 100644
--- a/karinacms/dev_center/views.py
+++ b/karinacms/dev_center/views.py
@@ -2,8 +2,8 @@
 from django.contrib.auth import authenticate, login, logout
 from django.contrib.auth.decorators import login_required
 from django.db.models import Count
-from .forms import DevForm, CampaignForm, DevCommentForm, UserForm, UserInfoForm, ProductForm, DevStatusForm
-from .models import Campaign, Dev, DevComment, DevStatus, Product
+from .forms import DevForm, CampaignForm, DevCommentForm, UserForm, UserInfoForm, ProductForm, DevStatusForm, DevHoursForm
+from .models import Campaign, Dev, DevComment, DevStatus, Product, DevHours
 from django.http import HttpResponseRedirect
 from datetime import datetime
 
@@ -64,14 +64,16 @@ def user_login(request):
     return render(request, 'dev_center/login.html', context)
 
 
+@login_required
 def set_admin_permissions(devData, github, asana):
-        workspaces = get_asana_workspaces()
-        send_github_invitation(devData.github) if devData.github != github or devData.status.name != 'inactive' else None
-        send_asana_invitation(devData.asana, workspaces) if devData.asana != asana or devData.status.name != 'inactive' else None
-        revoke_github_permissions(devData.github) if devData.status.name == 'inactive' else None
-        revoke_asana_permissions(devData.asana, workspaces) if devData.status.name == 'inactive' else None
+    workspaces = get_asana_workspaces()
+    send_github_invitation(devData.github) if devData.github != github or devData.status.name != 'inactive' else None
+    send_asana_invitation(devData.asana, workspaces) if devData.asana != asana or devData.status.name != 'inactive' else None
+    revoke_github_permissions(devData.github) if devData.status.name == 'inactive' else None
+    revoke_asana_permissions(devData.asana, workspaces) if devData.status.name == 'inactive' else None
 
 
+@login_required
 def send_github_invitation(user):
     # Sends a github invitation to the Team to the selected User.
     # User MUST be a username. Can't be an email.
@@ -81,6 +83,7 @@ def send_github_invitation(user):
     return r
 
 
+@login_required
 def revoke_github_permissions(user):
     # If the user is set to inactive, permissions to the user are denied
 
@@ -90,6 +93,7 @@ def revoke_github_permissions(user):
     return r
 
 
+@login_required
 def get_asana_workspaces():
     # Gets all projects available
     # Todo: Selectable project invitation.
@@ -103,6 +107,7 @@ def get_asana_workspaces():
     return workspaces
 
 
+@login_required
 def send_asana_invitation(user, workspaces):
     # Sends an invitation to each of the available workspaces.
 
@@ -116,6 +121,7 @@ def send_asana_invitation(user, workspaces):
     return responses
 
 
+@login_required
 def revoke_asana_permissions(user, workspaces):
     # If the user is set to inactive, permissions to the user are denied
 
@@ -129,6 +135,30 @@ def revoke_asana_permissions(user, workspaces):
     return responses
 
 
+@login_required
+def get_github_commits(req):
+    # Gets github
+
+    response = requests.get('https://api.github.com/orgs/onitsoft/repos',
+                     auth=(settings.GIT_USER, settings.GIT_ACCESS_TOKEN))
+    resp_json = response.json()
+    repos = [r['name'] for r in resp_json]
+    commits = []
+
+    for repo in repos:
+        response = requests.get('https://api.github.com/repos/onitsoft/' + repo + '/commits',
+                                auth=(settings.GIT_USER, settings.GIT_ACCESS_TOKEN))
+        commits.append(response.json())
+
+    a = 1
+    for commit in commits:
+        for i in commit:
+            if a == 1:
+                print i
+                a+=1
+            #print i['committer']['login'], i['commit']['message']
+    return resp_json
+
 
 @login_required
 def dev_form(request, campaign_name='eartohear.info'):
@@ -252,7 +282,7 @@ def delete_obj(request, obj_type, obj_id):
 
 
 @login_required
-def edit_obj (request, obj_type, obj_id):
+def edit_obj(request, obj_type, obj_id):
     if obj_type == 'campaign':
         model = Campaign
         form_class = CampaignForm
@@ -311,6 +341,17 @@ def status_list(request):
     return render(request, 'dev_center/status_list.html', context_dict)
 
 
+@login_required
+def hours_list(request):
+    working_hours = DevHours.objects.all()
+    a = get_github_commits(request)
+    form = DevHoursForm(request.POST or None)
+    if form.is_valid():
+        hours = form.save()
+    context_dict = {'hours': working_hours, 'form': form, 'obj_type': 'Hours'}
+    return render(request, 'dev_center/hours_list.html', context_dict)
+
+
 @login_required
 def user_logout(request):
     logout(request)
diff --git a/karinacms/templates/dev_center/common/base.html b/karinacms/templates/dev_center/common/base.html
index 43d3ddd..9b3cb33 100644
--- a/karinacms/templates/dev_center/common/base.html
+++ b/karinacms/templates/dev_center/common/base.html
@@ -36,6 +36,11 @@ <h3>Options</h3>
                             Devs statuses
                         </a>
                     </li>
+                    <li>
+                        <a href="/devs/hours">
+                            Working Hours
+                        </a>
+                    </li>
                <!--      <li>
                         <a href="/devs/options">
                             Options
diff --git a/karinacms/templates/dev_center/hours_list.html b/karinacms/templates/dev_center/hours_list.html
new file mode 100644
index 0000000..d8e130c
--- /dev/null
+++ b/karinacms/templates/dev_center/hours_list.html
@@ -0,0 +1,44 @@
+{% extends "dev_center/common/base.html" %}
+{% block title %}Products{% endblock %}
+{% block content %}
+<h1>Hours</h1>
+	{% if hours %}
+	    <div class="tbl">
+	        <div style="font-weight:bold;" class="row">
+	        	<div class="col col-lg-3">
+	                Name
+	            </div>
+
+	            <div class="col col-lg-3">
+	                Description
+	            </div>
+
+	            <div class="col col-lg-3">
+	                Dev count
+	            </div>
+	            <div class="col col-lg-3">
+	                Actions
+	            </div>
+	        </div>
+	        <div id="result_set">
+	        	{% include 'common/generic_list.html' with obj=products objStr="product" %}
+	        </div>
+	    </div>
+	{% else %}
+	        <div style="row">
+	            <div class="col-lg-12">
+	                No working hours are currently available right now
+	            </div>
+	        </div>
+	{% endif %}
+	{% if productAdded %}
+	<div style="row">
+	    <div class="col-lg-12">
+	    	<span class="success">
+	    		The product was added successfully
+	    	</span>
+	    </div>
+   </div>
+	{% endif %}
+	{% include "genericForm.html" %}
+{% endblock %}
\ No newline at end of file

From 0e4073c6571290254907e5200472cf9d86605bb7 Mon Sep 17 00:00:00 2001
From: root <arana_lucas@hotmail.com>
Date: Mon, 21 Mar 2016 14:58:51 -0300
Subject: [PATCH 09/11] finished_initial_template #time 4h30m

---
 karinacms/dev_center/views.py                 | 53 +++++++---
 karinacms/karinacms/local_settings.py         | 10 ++
 .../templates/dev_center/common/base.html     |  2 +-
 .../templates/dev_center/hours_list.html      | 99 ++++++++++++-------
 4 files changed, 113 insertions(+), 51 deletions(-)

diff --git a/karinacms/dev_center/views.py b/karinacms/dev_center/views.py
index 9056eaf..29f9ce5 100644
--- a/karinacms/dev_center/views.py
+++ b/karinacms/dev_center/views.py
@@ -64,6 +64,25 @@ def user_login(request):
     return render(request, 'dev_center/login.html', context)
 
 
+def parse_message(message):
+    hours = 0
+    minutes = 0
+    if '#time' in message:
+        time_tag = message.split('#time')[1]
+        if 'h' in time_tag:
+            hours_split = time_tag.split('h')
+            hours = int(hours_split[0])
+            minutes = int(hours_split[1].split('m')[0]) if 'm' in hours_split else 0
+
+        elif 'm' in time_tag:
+            minutes = int(time_tag.split('m')[0])
+
+    seconds = hours * 3600
+    seconds += minutes * 60
+
+    return seconds
+
+
 @login_required
 def set_admin_permissions(devData, github, asana):
     workspaces = get_asana_workspaces()
@@ -143,21 +162,30 @@ def get_github_commits(req):
                      auth=(settings.GIT_USER, settings.GIT_ACCESS_TOKEN))
     resp_json = response.json()
     repos = [r['name'] for r in resp_json]
-    commits = []
+    responses = {}
 
     for repo in repos:
         response = requests.get('https://api.github.com/repos/onitsoft/' + repo + '/commits',
                                 auth=(settings.GIT_USER, settings.GIT_ACCESS_TOKEN))
-        commits.append(response.json())
+        responses[repo] = response.json()
+
+    hours_worked = {'repo': {}, 'devs': {}}
+    for repo, commits in responses.iteritems():
+        for commit in commits:
+            time_worked = parse_message(commit['commit']['message'])
+
+            if repo in hours_worked['repo']:
+                hours_worked['repo'][repo] += time_worked
+            else:
+                hours_worked['repo'][repo] = time_worked
+
+            commiter = commit['commit']['committer']['name']
+            if commiter in hours_worked['devs']:
+                hours_worked['devs'] [commiter] += time_worked
+            else:
+                hours_worked['devs'] [commiter] = time_worked
 
-    a = 1
-    for commit in commits:
-        for i in commit:
-            if a == 1:
-                print i
-                a+=1
-            #print i['committer']['login'], i['commit']['message']
-    return resp_json
+    return hours_worked
 
 
 @login_required
@@ -165,7 +193,6 @@ def dev_form(request, campaign_name='eartohear.info'):
     campaign = None
     try:
         campaign = Campaign.objects.get(name=campaign_name)
-        print campaign
     except Campaign.DoesNotExist:
         pass  # do stuff
 
@@ -344,11 +371,11 @@ def status_list(request):
 @login_required
 def hours_list(request):
     working_hours = DevHours.objects.all()
-    a = get_github_commits(request)
+    hours_worked = get_github_commits(request)
     form = DevHoursForm(request.POST or None)
     if form.is_valid():
         hours = form.save()
-    context_dict = {'hours': working_hours, 'form': form, 'obj_type': 'Hours'}
+    context_dict = {'hours': working_hours, 'form': form, 'obj_type': 'Hours', 'hours_worked': hours_worked}
     return render(request, 'dev_center/hours_list.html', context_dict)
 
 
diff --git a/karinacms/karinacms/local_settings.py b/karinacms/karinacms/local_settings.py
index e69de29..e448764 100644
--- a/karinacms/karinacms/local_settings.py
+++ b/karinacms/karinacms/local_settings.py
@@ -0,0 +1,10 @@
+# Local Settings for Own Use
+
+
+# Git Credentials
+GIT_USER = 'lucasarana'
+GIT_ACCESS_TOKEN = 'eb27df5465aac2c76624e199316961e93abe9fd3'
+
+# Asana Credentials
+ASANA_USER = 'lucasarana38@gmail.com'
+ASANA_ACCESS_TOKEN = '0/b0c43409695322354343dc71e495114c'
diff --git a/karinacms/templates/dev_center/common/base.html b/karinacms/templates/dev_center/common/base.html
index 9b3cb33..a90c293 100644
--- a/karinacms/templates/dev_center/common/base.html
+++ b/karinacms/templates/dev_center/common/base.html
@@ -38,7 +38,7 @@ <h3>Options</h3>
                     </li>
                     <li>
                         <a href="/devs/hours">
-                            Working Hours
+                            Hours Worked
                         </a>
                     </li>
                <!--      <li>
diff --git a/karinacms/templates/dev_center/hours_list.html b/karinacms/templates/dev_center/hours_list.html
index d8e130c..0313c67 100644
--- a/karinacms/templates/dev_center/hours_list.html
+++ b/karinacms/templates/dev_center/hours_list.html
@@ -1,44 +1,69 @@
 {% extends "dev_center/common/base.html" %}
-{% block title %}Products{% endblock %}
+{% block title %}Hours Worked{% endblock %}
 {% block content %}
-<h1>Hours</h1>
-	{% if hours %}
-	    <div class="tbl">
-	        <div style="font-weight:bold;" class="row">
-	        	<div class="col col-lg-3">
-	                Name
-	            </div>
+<h1>Hours Worked</h1>
 
-	            <div class="col col-lg-3">
-	                Description
-	            </div>
+<h2>Repositories</h2>
+<div class="tbl">
+	<div style="font-weight:bold;" class="row">
+		<div class="col-lg-8">
+			Repository
+	</div>
+	<div style="font-weight:bold;" class="row">
+		<div class="col-lg-4">
+			Hours Worked
+	</div>
+    </div>
+    </div>
 
-	            <div class="col col-lg-3">
-	                Dev count
-	            </div>
-	            <div class="col col-lg-3">
-	                Actions
-	            </div>
-	        </div>
-	        <div id="result_set">
-	        	{% include 'common/generic_list.html' with obj=products objStr="product" %}
-	        </div>
-	    </div>
-	{% else %}
-	        <div style="row">
-	            <div class="col-lg-12">
-	                No working hours are currently available right now
-	            </div>
-	        </div>
+{% for key, values in hours_worked.items %}
+	{% if key == 'repo' %}
+		{% for k, v in values.items %}
+			<div class="row">
+				<div class="col-lg-8">
+					{{k}}
+				</div>
+			<div class="row">
+				<div class="col-lg-4">
+					{{v}} Segs
+				</div>
+			</div>
+			</div>
+		{% endfor %}
 	{% endif %}
-	{% if productAdded %}
-	<div style="row">
-	    <div class="col-lg-12">
-	    	<span class="success">
-	    		The product was added successfully
-	    	</span>
-	    </div>
-   </div>
+{% endfor %}
+</div>
+
+<h2>Developers</h2>
+<div class="tbl">
+	<div style="font-weight:bold;" class="row">
+		<div class="col-lg-8">
+			Developer
+	</div>
+	<div style="font-weight:bold;" class="row">
+		<div class="col-lg-4">
+			Hours Worked
+	</div>
+    </div>
+    </div>
+
+{% for key, values in hours_worked.items %}
+	{% if key == 'devs' %}
+		{% for k, v in values.items %}
+			<div class="row">
+				<div class="col-lg-8">
+					{{k}}
+				</div>
+			<div class="row">
+				<div class="col-lg-4">
+					{{v}} Segs
+				</div>
+			</div>
+			</div>
+		{% endfor %}
 	{% endif %}
+{% endfor %}
+</div>
 	{% include "genericForm.html" %}
-{% endblock %}
\ No newline at end of file
+{% endblock %}
+

From 0c2995367452dceb367ddf8024f85950309f7b29 Mon Sep 17 00:00:00 2001
From: root <arana_lucas@hotmail.com>
Date: Tue, 22 Mar 2016 17:08:32 -0300
Subject: [PATCH 10/11] fixed 30 messages commits_Added since/until and dev
 filter #time 8h30m

---
 karinacms/dev_center/forms.py                 |   5 +-
 ...t__chg_field_devhours_since__chg_field_.py | 137 ++++++++++++++++++
 karinacms/dev_center/models.py                |   8 +-
 karinacms/dev_center/views.py                 | 102 ++++++++-----
 karinacms/karinacms/local_settings.py         |   2 +-
 karinacms/karinacms/settings.py               |   5 +-
 6 files changed, 218 insertions(+), 41 deletions(-)
 create mode 100644 karinacms/dev_center/migrations/0003_auto__del_field_devhours_product__chg_field_devhours_since__chg_field_.py

diff --git a/karinacms/dev_center/forms.py b/karinacms/dev_center/forms.py
index fa466f8..b4462a5 100644
--- a/karinacms/dev_center/forms.py
+++ b/karinacms/dev_center/forms.py
@@ -1,6 +1,7 @@
 from django import forms
 from django.contrib.auth.models import User
 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):
@@ -32,9 +33,11 @@ class Meta:
 		fields = ('name', 'description',)
 
 class DevHoursForm(BootstrapForm):
+	since = forms.DateField(widget=SelectDateWidget)
+	until = forms.CharField(widget=SelectDateWidget)
 	class Meta:
 		model = DevHours
-		fields = ('dev', 'product',)
+		fields = ('dev', 'since', 'until',)
 
 class DevStatusForm(BootstrapForm):
 	class Meta:
diff --git a/karinacms/dev_center/migrations/0003_auto__del_field_devhours_product__chg_field_devhours_since__chg_field_.py b/karinacms/dev_center/migrations/0003_auto__del_field_devhours_product__chg_field_devhours_since__chg_field_.py
new file mode 100644
index 0000000..584b258
--- /dev/null
+++ b/karinacms/dev_center/migrations/0003_auto__del_field_devhours_product__chg_field_devhours_since__chg_field_.py
@@ -0,0 +1,137 @@
+# -*- coding: utf-8 -*-
+from south.utils import datetime_utils as datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Deleting field 'DevHours.product'
+        db.delete_column(u'dev_center_devhours', 'product_id')
+
+
+        # Changing field 'DevHours.since'
+        db.alter_column(u'dev_center_devhours', 'since', self.gf('django.db.models.fields.DateField')(auto_now=True))
+
+        # Changing field 'DevHours.until'
+        db.alter_column(u'dev_center_devhours', 'until', self.gf('django.db.models.fields.DateField')(auto_now=True))
+
+    def backwards(self, orm):
+
+        # User chose to not deal with backwards NULL issues for 'DevHours.product'
+        raise RuntimeError("Cannot reverse this migration. 'DevHours.product' and its values cannot be restored.")
+        
+        # The following code is provided here to aid in writing a correct migration        # Adding field 'DevHours.product'
+        db.add_column(u'dev_center_devhours', 'product',
+                      self.gf('django.db.models.fields.related.ForeignKey')(to=orm['dev_center.Product']),
+                      keep_default=False)
+
+
+        # Changing field 'DevHours.since'
+        db.alter_column(u'dev_center_devhours', 'since', self.gf('django.db.models.fields.DateTimeField')(auto_now=True))
+
+        # Changing field 'DevHours.until'
+        db.alter_column(u'dev_center_devhours', 'until', self.gf('django.db.models.fields.DateTimeField')(auto_now=True))
+
+    models = {
+        u'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        u'auth.permission': {
+            'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        u'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        u'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        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'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', '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', [], {'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'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'}),
+            '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'dev_center.devhours': {
+            'Meta': {'object_name': 'DevHours'},
+            'dev': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['dev_center.Dev']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'since': ('django.db.models.fields.DateField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'until': ('django.db.models.fields.DateField', [], {'auto_now': 'True', 'blank': 'True'})
+        },
+        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'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'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 = ['dev_center']
\ No newline at end of file
diff --git a/karinacms/dev_center/models.py b/karinacms/dev_center/models.py
index 73e77f6..f08bb08 100644
--- a/karinacms/dev_center/models.py
+++ b/karinacms/dev_center/models.py
@@ -1,6 +1,7 @@
 from django.db import models
 from django.contrib.auth.models import User
-# from django.conf import settings 
+
+# from django.conf import settings
 # Create your models here.
 class UserInfo(models.Model):
 	user = models.OneToOneField(User)
@@ -60,8 +61,7 @@ class DevComment(models.Model):
 
 class DevHours(models.Model):
 	dev = models.ForeignKey(Dev)
-	since = models.DateField(auto_now=True)
-	until = models.DateField(auto_now=True)
-	product = models.ForeignKey(Product)
+	since = models.DateField()
+	until = models.DateField()
 	def __unicode__(self):
 		return self.dev
\ No newline at end of file
diff --git a/karinacms/dev_center/views.py b/karinacms/dev_center/views.py
index 29f9ce5..b6f0263 100644
--- a/karinacms/dev_center/views.py
+++ b/karinacms/dev_center/views.py
@@ -14,6 +14,7 @@
 from karinacms import settings
 import requests
 import json
+import re
 
 # import sys
 # sys.path.insert(0, '/path/to/application/app/folder')
@@ -65,17 +66,12 @@ def user_login(request):
 
 
 def parse_message(message):
-    hours = 0
-    minutes = 0
+    hours = minutes = 0
     if '#time' in message:
-        time_tag = message.split('#time')[1]
-        if 'h' in time_tag:
-            hours_split = time_tag.split('h')
-            hours = int(hours_split[0])
-            minutes = int(hours_split[1].split('m')[0]) if 'm' in hours_split else 0
-
-        elif 'm' in time_tag:
-            minutes = int(time_tag.split('m')[0])
+        time_tag = str(message.split('#time')[1])
+        time_spent = [int(s) for s in re.findall(r'\d+', time_tag)]
+        hours = time_spent[0]
+        minutes = time_spent[1] if len(time_spent) > 1 else 0
 
     seconds = hours * 3600
     seconds += minutes * 60
@@ -86,14 +82,14 @@ def parse_message(message):
 @login_required
 def set_admin_permissions(devData, github, asana):
     workspaces = get_asana_workspaces()
-    send_github_invitation(devData.github) if devData.github != github or devData.status.name != 'inactive' else None
-    send_asana_invitation(devData.asana, workspaces) if devData.asana != asana or devData.status.name != 'inactive' else None
-    revoke_github_permissions(devData.github) if devData.status.name == 'inactive' else None
-    revoke_asana_permissions(devData.asana, workspaces) if devData.status.name == 'inactive' else None
+    send_github_invitation(devData, devData.github) if devData.github != github or devData.status.name != 'inactive' else None
+    send_asana_invitation(devData, devData.asana, workspaces) if devData.asana != asana or devData.status.name != 'inactive' else None
+    revoke_github_permissions(devData, devData.github) if devData.status.name == 'inactive' else None
+    revoke_asana_permissions(devData, devData.asana, workspaces) if devData.status.name == 'inactive' else None
 
 
 @login_required
-def send_github_invitation(user):
+def send_github_invitation(req, user):
     # Sends a github invitation to the Team to the selected User.
     # User MUST be a username. Can't be an email.
 
@@ -103,7 +99,7 @@ def send_github_invitation(user):
 
 
 @login_required
-def revoke_github_permissions(user):
+def revoke_github_permissions(req, user):
     # If the user is set to inactive, permissions to the user are denied
 
     r = requests.delete(settings.API_GITHUB_URL + settings.GIT_MEMBERSHIP + user,
@@ -127,7 +123,7 @@ def get_asana_workspaces():
 
 
 @login_required
-def send_asana_invitation(user, workspaces):
+def send_asana_invitation(req, user, workspaces):
     # Sends an invitation to each of the available workspaces.
 
     responses = []
@@ -141,7 +137,7 @@ def send_asana_invitation(user, workspaces):
 
 
 @login_required
-def revoke_asana_permissions(user, workspaces):
+def revoke_asana_permissions(req, user, workspaces):
     # If the user is set to inactive, permissions to the user are denied
 
     responses = []
@@ -155,22 +151,54 @@ def revoke_asana_permissions(user, workspaces):
 
 
 @login_required
-def get_github_commits(req):
-    # Gets github
+def get_commits_and_hours_worked(req, params):
+    # Calls functions to get all commits and parse them into hours worked
 
-    response = requests.get('https://api.github.com/orgs/onitsoft/repos',
-                     auth=(settings.GIT_USER, settings.GIT_ACCESS_TOKEN))
+    repositories = get_github_repos(req)
+    commit_responses = get_all_github_commits(req, repositories, params)
+    hours_worked = get_hours_worked(commit_responses)
+
+    return hours_worked
+
+@login_required
+def get_github_repos(req):
+    # Gets All github repos of the Organization (GIT_ORGANIZATION)
+
+    response = requests.get(settings.API_GITHUB_URL + settings.GIT_GET_REPOS,
+                            auth=(settings.GIT_USER, settings.GIT_ACCESS_TOKEN))
     resp_json = response.json()
     repos = [r['name'] for r in resp_json]
-    responses = {}
 
+    return repos
+
+
+@login_required
+def get_all_github_commits(req, repos, params):
+    # Gets all commits from the repos of the organization
+
+    commit_responses = {}
     for repo in repos:
-        response = requests.get('https://api.github.com/repos/onitsoft/' + repo + '/commits',
+        response = requests.get(settings.API_GITHUB_URL + settings.GIT_REPOS + repo + '/commits',
+                                params=params,
                                 auth=(settings.GIT_USER, settings.GIT_ACCESS_TOKEN))
-        responses[repo] = response.json()
+        commit_responses[repo] = response.json()
+
+        while 'link' in response.headers and 'next' in response.headers['link']:
+            link_next_page = response.headers['link'].split('; rel="next"')[0].replace('<', '').replace('>', '')
+            response = requests.get(link_next_page,
+                                    params=params,
+                                    auth=(settings.GIT_USER, settings.GIT_ACCESS_TOKEN))
+
+            commit_responses[repo] = response.json() + commit_responses[repo]
+
+    return commit_responses
+
+
+def get_hours_worked(commit_responses):
+    # Parse Info into hours works for each repo and dev available
 
     hours_worked = {'repo': {}, 'devs': {}}
-    for repo, commits in responses.iteritems():
+    for repo, commits in commit_responses.iteritems():
         for commit in commits:
             time_worked = parse_message(commit['commit']['message'])
 
@@ -181,9 +209,9 @@ def get_github_commits(req):
 
             commiter = commit['commit']['committer']['name']
             if commiter in hours_worked['devs']:
-                hours_worked['devs'] [commiter] += time_worked
+                hours_worked['devs'][commiter] += time_worked
             else:
-                hours_worked['devs'] [commiter] = time_worked
+                hours_worked['devs'][commiter] = time_worked
 
     return hours_worked
 
@@ -205,9 +233,9 @@ def dev_form(request, campaign_name='eartohear.info'):
         dev.campaign = campaign
         dev.save()
         context_dict['success'] = True
-        git_response = send_github_invitation(dev.github) if dev.github else None
-        asana_responses = send_asana_invitation(dev.asana) if dev.asana else None
-        # Todo: Show if exceptions appear/success
+        git_response = send_github_invitation(request, dev.github) if dev.github else None
+        asana_responses = send_asana_invitation(request, dev.asana) if dev.asana else None
+        # Todo: Show exceptions and success
 
     return render(request, 'dev_center/dev_form.html', context_dict)
 
@@ -370,12 +398,17 @@ def status_list(request):
 
 @login_required
 def hours_list(request):
-    working_hours = DevHours.objects.all()
-    hours_worked = get_github_commits(request)
+    params = {'per_page': 100}
     form = DevHoursForm(request.POST or None)
     if form.is_valid():
         hours = form.save()
-    context_dict = {'hours': working_hours, 'form': form, 'obj_type': 'Hours', 'hours_worked': hours_worked}
+        params['author'] = str(form.cleaned_data['dev'].github) if form.cleaned_data['dev'] else None
+        print form.cleaned_data['since']
+        print form.cleaned_data['until']
+        hours_worked = get_commits_and_hours_worked(request, params)
+    else:
+        hours_worked = get_commits_and_hours_worked(request, params)
+    context_dict = {'form': form, 'obj_type': 'Hours', 'hours_worked': hours_worked}
     return render(request, 'dev_center/hours_list.html', context_dict)
 
 
@@ -384,6 +417,7 @@ def user_logout(request):
     logout(request)
     return HttpResponseRedirect('/devs/')
 
+
 def index(request):
     devs = Dev.objects.all().order_by('phone')
     context_dict = {'devs': devs}
diff --git a/karinacms/karinacms/local_settings.py b/karinacms/karinacms/local_settings.py
index e448764..1546b88 100644
--- a/karinacms/karinacms/local_settings.py
+++ b/karinacms/karinacms/local_settings.py
@@ -3,7 +3,7 @@
 
 # Git Credentials
 GIT_USER = 'lucasarana'
-GIT_ACCESS_TOKEN = 'eb27df5465aac2c76624e199316961e93abe9fd3'
+GIT_ACCESS_TOKEN = 'c099d0c63cea97469cb18ae85c6cd44469a5d2c0'
 
 # Asana Credentials
 ASANA_USER = 'lucasarana38@gmail.com'
diff --git a/karinacms/karinacms/settings.py b/karinacms/karinacms/settings.py
index b6059c8..3c2870b 100644
--- a/karinacms/karinacms/settings.py
+++ b/karinacms/karinacms/settings.py
@@ -117,7 +117,10 @@
 
 # Github Credentials
 API_GITHUB_URL = 'https://api.github.com/'
-GIT_MEMBERSHIP = 'orgs/onitsoft/memberships/'
+GIT_ORGANIZATION = 'onitsoft'
+GIT_MEMBERSHIP = 'orgs/' + GIT_ORGANIZATION + '/memberships/'
+GIT_GET_REPOS = 'orgs/' + GIT_ORGANIZATION + '/repos'
+GIT_REPOS = 'repos/' + GIT_ORGANIZATION + '/'
 GIT_USER = ''
 GIT_ACCESS_TOKEN = ''
 

From d7ba5c6848685b76ddae3e597af9e07516a37b10 Mon Sep 17 00:00:00 2001
From: root <arana_lucas@hotmail.com>
Date: Wed, 30 Mar 2016 10:58:08 -0300
Subject: [PATCH 11/11] changed database to postgres #time 1h30m

---
 karinacms/dev_center/forms.py                 |   4 +-
 ...evhours_since__chg_field_devhours_until.py | 125 ++++++++++++++++++
 karinacms/karinacms/settings.py               |   8 +-
 karinacms/requirements.txt                    |   3 +-
 4 files changed, 135 insertions(+), 5 deletions(-)
 create mode 100644 karinacms/dev_center/migrations/0004_auto__chg_field_devhours_since__chg_field_devhours_until.py

diff --git a/karinacms/dev_center/forms.py b/karinacms/dev_center/forms.py
index b4462a5..4b5fde3 100644
--- a/karinacms/dev_center/forms.py
+++ b/karinacms/dev_center/forms.py
@@ -33,8 +33,8 @@ class Meta:
 		fields = ('name', 'description',)
 
 class DevHoursForm(BootstrapForm):
-	since = forms.DateField(widget=SelectDateWidget)
-	until = forms.CharField(widget=SelectDateWidget)
+	since = forms.DateField(widget=SelectDateWidget, required=False)
+	until = forms.CharField(widget=SelectDateWidget, required=False)
 	class Meta:
 		model = DevHours
 		fields = ('dev', 'since', 'until',)
diff --git a/karinacms/dev_center/migrations/0004_auto__chg_field_devhours_since__chg_field_devhours_until.py b/karinacms/dev_center/migrations/0004_auto__chg_field_devhours_since__chg_field_devhours_until.py
new file mode 100644
index 0000000..a9285ab
--- /dev/null
+++ b/karinacms/dev_center/migrations/0004_auto__chg_field_devhours_since__chg_field_devhours_until.py
@@ -0,0 +1,125 @@
+# -*- coding: utf-8 -*-
+from south.utils import datetime_utils as datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+
+        # Changing field 'DevHours.since'
+        db.alter_column(u'dev_center_devhours', 'since', self.gf('django.db.models.fields.DateField')())
+
+        # Changing field 'DevHours.until'
+        db.alter_column(u'dev_center_devhours', 'until', self.gf('django.db.models.fields.DateField')())
+
+    def backwards(self, orm):
+
+        # Changing field 'DevHours.since'
+        db.alter_column(u'dev_center_devhours', 'since', self.gf('django.db.models.fields.DateField')(auto_now=True))
+
+        # Changing field 'DevHours.until'
+        db.alter_column(u'dev_center_devhours', 'until', self.gf('django.db.models.fields.DateField')(auto_now=True))
+
+    models = {
+        u'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        u'auth.permission': {
+            'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        u'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        u'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        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'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', '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', [], {'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'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'}),
+            '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'dev_center.devhours': {
+            'Meta': {'object_name': 'DevHours'},
+            'dev': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['dev_center.Dev']", 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'since': ('django.db.models.fields.DateField', [], {'default': 'datetime.date.today', 'blank': 'True'}),
+            'until': ('django.db.models.fields.DateField', [], {'blank': 'True'})
+        },
+        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'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'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 = ['dev_center']
\ No newline at end of file
diff --git a/karinacms/karinacms/settings.py b/karinacms/karinacms/settings.py
index 3c2870b..220ca64 100644
--- a/karinacms/karinacms/settings.py
+++ b/karinacms/karinacms/settings.py
@@ -90,8 +90,12 @@
 
 DATABASES = {
     'default': {
-        'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
+        'ENGINE': 'django.db.backends.postgresql_psycopg2',
+        'NAME': 'django_crm',
+        'USER': 'lucas',
+        'PASSWORD': 'lucas',
+        'HOST': 'localhost',
+        'PORT': '',
     }
 }
 
diff --git a/karinacms/requirements.txt b/karinacms/requirements.txt
index 0252a9a..2f116ba 100644
--- a/karinacms/requirements.txt
+++ b/karinacms/requirements.txt
@@ -6,4 +6,5 @@ argparse==1.2.1
 distribute==0.6.24
 djangorestframework==2.3.10
 wsgiref==0.1.2
-requests
+requests==2.9.1
+psycopg2==2.6.1