From 8610b33839399c21687d2797c73a04308f4dfe19 Mon Sep 17 00:00:00 2001 From: yashwanthbabu Date: Sat, 6 Aug 2016 21:40:37 +0530 Subject: [PATCH] Upgrade django to 1.9 --- leave_tracker/migrations/0001_initial.py | 172 ++++++------------ .../0002_rename_leaves_to_leave_category.py | 82 --------- .../migrations/0003_rename_number_fo_days.py | 81 --------- ..._add_field_leaveapplication_num_of_days.py | 85 --------- leave_tracker/migrations/0005_num_of_days.py | 96 ---------- ..._chg_field_leaveapplication_num_of_days.py | 83 --------- ...uto__del_field_userprofile_leaves_taken.py | 82 --------- ...n_start_date_new__add_field_leaveapplic.py | 94 ---------- .../migrations/0009_modify_datetime_fields.py | 98 ---------- ...n_end_date__del_field_leaveapplication_.py | 88 --------- ...n_start_date_new__del_field_leaveapplic.py | 82 --------- ...n_end_date__chg_field_leaveapplication_.py | 88 --------- .../migrations/0013_update_num_of_days.py | 94 ---------- leave_tracker/models.py | 6 +- .../templates/leave_tracker/base.html | 2 +- .../templates/leave_tracker/index.html | 3 +- leave_tracker/urls.py | 1 - leaves/settings.py | 25 ++- leaves/urls.py | 2 + requirements.txt | 5 +- 20 files changed, 85 insertions(+), 1184 deletions(-) delete mode 100644 leave_tracker/migrations/0002_rename_leaves_to_leave_category.py delete mode 100644 leave_tracker/migrations/0003_rename_number_fo_days.py delete mode 100644 leave_tracker/migrations/0004_auto__add_field_leaveapplication_num_of_days.py delete mode 100644 leave_tracker/migrations/0005_num_of_days.py delete mode 100644 leave_tracker/migrations/0006_auto__chg_field_leaveapplication_num_of_days.py delete mode 100644 leave_tracker/migrations/0007_auto__del_field_userprofile_leaves_taken.py delete mode 100644 leave_tracker/migrations/0008_auto__add_field_leaveapplication_start_date_new__add_field_leaveapplic.py delete mode 100644 leave_tracker/migrations/0009_modify_datetime_fields.py delete mode 100644 leave_tracker/migrations/0010_auto__del_field_leaveapplication_end_date__del_field_leaveapplication_.py delete mode 100644 leave_tracker/migrations/0011_auto__del_field_leaveapplication_start_date_new__del_field_leaveapplic.py delete mode 100644 leave_tracker/migrations/0012_auto__chg_field_leaveapplication_end_date__chg_field_leaveapplication_.py delete mode 100644 leave_tracker/migrations/0013_update_num_of_days.py diff --git a/leave_tracker/migrations/0001_initial.py b/leave_tracker/migrations/0001_initial.py index 7c5329e..0b670ed 100644 --- a/leave_tracker/migrations/0001_initial.py +++ b/leave_tracker/migrations/0001_initial.py @@ -1,114 +1,60 @@ # -*- coding: utf-8 -*- -import 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 'Leave' - db.create_table('leave_tracker_leave', ( - ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('type_of_leave', self.gf('django.db.models.fields.CharField')(max_length=20)), - ('number_fo_days', self.gf('django.db.models.fields.IntegerField')(max_length=10)), - )) - db.send_create_signal('leave_tracker', ['Leave']) - - # Adding model 'UserProfile' - db.create_table('leave_tracker_userprofile', ( - ('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)), - ('leaves_taken', self.gf('django.db.models.fields.PositiveIntegerField')(max_length=10)), - ('total_leaves', self.gf('django.db.models.fields.PositiveIntegerField')(max_length=10)), - )) - db.send_create_signal('leave_tracker', ['UserProfile']) - - # Adding model 'LeaveApplication' - db.create_table('leave_tracker_leaveapplication', ( - ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('start_date', self.gf('django.db.models.fields.DateTimeField')()), - ('end_date', self.gf('django.db.models.fields.DateTimeField')()), - ('usr', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['leave_tracker.UserProfile'])), - ('leave', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['leave_tracker.Leave'])), - ('status', self.gf('django.db.models.fields.BooleanField')(default=False)), - ('subject', self.gf('django.db.models.fields.TextField')()), - )) - db.send_create_signal('leave_tracker', ['LeaveApplication']) - - - def backwards(self, orm): - # Deleting model 'Leave' - db.delete_table('leave_tracker_leave') - - # Deleting model 'UserProfile' - db.delete_table('leave_tracker_userprofile') - - # Deleting model 'LeaveApplication' - db.delete_table('leave_tracker_leaveapplication') - - - models = { - 'auth.group': { - 'Meta': {'object_name': 'Group'}, - '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': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) - }, - 'auth.permission': { - 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - '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', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), - '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', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - }, - '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'}), - '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'}) - }, - 'leave_tracker.leave': { - 'Meta': {'object_name': 'Leave'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'number_fo_days': ('django.db.models.fields.IntegerField', [], {'max_length': '10'}), - 'type_of_leave': ('django.db.models.fields.CharField', [], {'max_length': '20'}) - }, - 'leave_tracker.leaveapplication': { - 'Meta': {'object_name': 'LeaveApplication'}, - 'end_date': ('django.db.models.fields.DateTimeField', [], {}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'leave': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['leave_tracker.Leave']"}), - 'start_date': ('django.db.models.fields.DateTimeField', [], {}), - 'status': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'subject': ('django.db.models.fields.TextField', [], {}), - 'usr': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['leave_tracker.UserProfile']"}) - }, - 'leave_tracker.userprofile': { - 'Meta': {'object_name': 'UserProfile'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'leaves_taken': ('django.db.models.fields.PositiveIntegerField', [], {'max_length': '10'}), - 'total_leaves': ('django.db.models.fields.PositiveIntegerField', [], {'max_length': '10'}), - 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'}) - } - } - - complete_apps = ['leave_tracker'] \ No newline at end of file +# Generated by Django 1.9.9 on 2016-08-06 15:47 +from __future__ import unicode_literals + +from django.conf import settings +import django.core.validators +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ] + + operations = [ + migrations.CreateModel( + name='LeaveApplication', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('start_date', models.DateField()), + ('end_date', models.DateField()), + ('num_of_days', models.IntegerField()), + ('status', models.BooleanField(default=False)), + ('subject', models.TextField()), + ], + ), + migrations.CreateModel( + name='LeaveCategory', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('type_of_leave', models.CharField(max_length=20)), + ('number_of_days', models.PositiveIntegerField(validators=[django.core.validators.MaxValueValidator(9999999999)])), + ], + options={ + 'verbose_name_plural': 'Leave Categories', + }, + ), + migrations.CreateModel( + name='UserProfile', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('total_leaves', models.PositiveIntegerField(validators=[django.core.validators.MaxValueValidator(9999999999)])), + ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), + ], + ), + migrations.AddField( + model_name='leaveapplication', + name='leave_category', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='leave_tracker.LeaveCategory'), + ), + migrations.AddField( + model_name='leaveapplication', + name='usr', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='leave_tracker.UserProfile'), + ), + ] diff --git a/leave_tracker/migrations/0002_rename_leaves_to_leave_category.py b/leave_tracker/migrations/0002_rename_leaves_to_leave_category.py deleted file mode 100644 index 08d6d9b..0000000 --- a/leave_tracker/migrations/0002_rename_leaves_to_leave_category.py +++ /dev/null @@ -1,82 +0,0 @@ -# -*- coding: utf-8 -*- -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - - -class Migration(SchemaMigration): - - - def forwards(self, orm): - db.rename_table("leave_tracker_leave", "leave_tracker_leavecategory") - db.rename_column("leave_tracker_leaveapplication", "leave_id", "leave_category_id") - - def backwards(self, orm): - db.rename_table("leave_tracker_leavecategory", "leave_tracker_leave") - db.rename_column("leave_tracker_leaveapplication", "leave_category_id", "leave_id") - - - models = { - 'auth.group': { - 'Meta': {'object_name': 'Group'}, - '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': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) - }, - 'auth.permission': { - 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - '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', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), - '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', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - }, - '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'}), - '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'}) - }, - 'leave_tracker.leaveapplication': { - 'Meta': {'object_name': 'LeaveApplication'}, - 'end_date': ('django.db.models.fields.DateTimeField', [], {}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'leave_category': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['leave_tracker.LeaveCategory']"}), - 'start_date': ('django.db.models.fields.DateTimeField', [], {}), - 'status': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'subject': ('django.db.models.fields.TextField', [], {}), - 'usr': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['leave_tracker.UserProfile']"}) - }, - 'leave_tracker.leavecategory': { - 'Meta': {'object_name': 'LeaveCategory'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'number_fo_days': ('django.db.models.fields.IntegerField', [], {'max_length': '10'}), - 'type_of_leave': ('django.db.models.fields.CharField', [], {'max_length': '20'}) - }, - 'leave_tracker.userprofile': { - 'Meta': {'object_name': 'UserProfile'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'leaves_taken': ('django.db.models.fields.PositiveIntegerField', [], {'max_length': '10'}), - 'total_leaves': ('django.db.models.fields.PositiveIntegerField', [], {'max_length': '10'}), - 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'}) - } - } - - complete_apps = ['leave_tracker'] diff --git a/leave_tracker/migrations/0003_rename_number_fo_days.py b/leave_tracker/migrations/0003_rename_number_fo_days.py deleted file mode 100644 index 37e7b30..0000000 --- a/leave_tracker/migrations/0003_rename_number_fo_days.py +++ /dev/null @@ -1,81 +0,0 @@ -# -*- coding: utf-8 -*- -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - - -class Migration(SchemaMigration): - - def forwards(self, orm): - db.rename_column("leave_tracker_leavecategory", "number_fo_days", - "number_of_days") - - def backwards(self, orm): - db.rename_column("leave_tracker_leavecategory", "number_of_days", - "number_fo_days") - - - models = { - 'auth.group': { - 'Meta': {'object_name': 'Group'}, - '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': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) - }, - 'auth.permission': { - 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - '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', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), - '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', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - }, - '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'}), - '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'}) - }, - 'leave_tracker.leaveapplication': { - 'Meta': {'object_name': 'LeaveApplication'}, - 'end_date': ('django.db.models.fields.DateTimeField', [], {}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'leave_category': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['leave_tracker.LeaveCategory']"}), - 'start_date': ('django.db.models.fields.DateTimeField', [], {}), - 'status': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'subject': ('django.db.models.fields.TextField', [], {}), - 'usr': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['leave_tracker.UserProfile']"}) - }, - 'leave_tracker.leavecategory': { - 'Meta': {'object_name': 'LeaveCategory'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'number_of_days': ('django.db.models.fields.IntegerField', [], {'max_length': '10'}), - 'type_of_leave': ('django.db.models.fields.CharField', [], {'max_length': '20'}) - }, - 'leave_tracker.userprofile': { - 'Meta': {'object_name': 'UserProfile'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'leaves_taken': ('django.db.models.fields.PositiveIntegerField', [], {'max_length': '10'}), - 'total_leaves': ('django.db.models.fields.PositiveIntegerField', [], {'max_length': '10'}), - 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'}) - } - } - - complete_apps = ['leave_tracker'] \ No newline at end of file diff --git a/leave_tracker/migrations/0004_auto__add_field_leaveapplication_num_of_days.py b/leave_tracker/migrations/0004_auto__add_field_leaveapplication_num_of_days.py deleted file mode 100644 index 8bd671b..0000000 --- a/leave_tracker/migrations/0004_auto__add_field_leaveapplication_num_of_days.py +++ /dev/null @@ -1,85 +0,0 @@ -# -*- coding: utf-8 -*- -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - - -class Migration(SchemaMigration): - - def forwards(self, orm): - # Adding field 'LeaveApplication.num_of_days' - db.add_column('leave_tracker_leaveapplication', 'num_of_days', - self.gf('django.db.models.fields.IntegerField')(null=True), - keep_default=False) - - - def backwards(self, orm): - # Deleting field 'LeaveApplication.num_of_days' - db.delete_column('leave_tracker_leaveapplication', 'num_of_days') - - - models = { - 'auth.group': { - 'Meta': {'object_name': 'Group'}, - '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': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) - }, - 'auth.permission': { - 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - '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', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), - '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', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - }, - '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'}), - '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'}) - }, - 'leave_tracker.leaveapplication': { - 'Meta': {'object_name': 'LeaveApplication'}, - 'end_date': ('django.db.models.fields.DateTimeField', [], {}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'leave_category': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['leave_tracker.LeaveCategory']"}), - 'num_of_days': ('django.db.models.fields.IntegerField', [], {'null': 'True'}), - 'start_date': ('django.db.models.fields.DateTimeField', [], {}), - 'status': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'subject': ('django.db.models.fields.TextField', [], {}), - 'usr': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['leave_tracker.UserProfile']"}) - }, - 'leave_tracker.leavecategory': { - 'Meta': {'object_name': 'LeaveCategory'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'number_of_days': ('django.db.models.fields.IntegerField', [], {'max_length': '10'}), - 'type_of_leave': ('django.db.models.fields.CharField', [], {'max_length': '20'}) - }, - 'leave_tracker.userprofile': { - 'Meta': {'object_name': 'UserProfile'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'leaves_taken': ('django.db.models.fields.PositiveIntegerField', [], {'max_length': '10'}), - 'total_leaves': ('django.db.models.fields.PositiveIntegerField', [], {'max_length': '10'}), - 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'}) - } - } - - complete_apps = ['leave_tracker'] \ No newline at end of file diff --git a/leave_tracker/migrations/0005_num_of_days.py b/leave_tracker/migrations/0005_num_of_days.py deleted file mode 100644 index b162f1b..0000000 --- a/leave_tracker/migrations/0005_num_of_days.py +++ /dev/null @@ -1,96 +0,0 @@ -# -*- coding: utf-8 -*- -from datetime import timedelta -from south.db import db -from south.v2 import DataMigration -from django.db import models -from django.conf import settings - -class Migration(DataMigration): - - def forwards(self, orm): - holidays = settings.WEEKEND_HOLIDAYS - LeaveApplication = orm['leave_tracker.LeaveApplication'] - leaves = LeaveApplication.objects.all() - for leave in leaves: - start = leave.start_date - end = leave.end_date - dg = (start + timedelta(x+1) for x in xrange((end-start).days)) - s = 0 - s = sum(1 for day in dg if day.weekday() not in holidays) - if start.weekday() < 5: - s += 1 - - leave.num_of_days = s - leave.save() - - - - - def backwards(self, orm): - "Write your backwards methods here." - - models = { - 'auth.group': { - 'Meta': {'object_name': 'Group'}, - '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': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) - }, - 'auth.permission': { - 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - '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', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), - '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', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - }, - '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'}), - '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'}) - }, - 'leave_tracker.leaveapplication': { - 'Meta': {'object_name': 'LeaveApplication'}, - 'end_date': ('django.db.models.fields.DateTimeField', [], {}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'leave_category': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['leave_tracker.LeaveCategory']"}), - 'num_of_days': ('django.db.models.fields.IntegerField', [], {'null': 'True'}), - 'start_date': ('django.db.models.fields.DateTimeField', [], {}), - 'status': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'subject': ('django.db.models.fields.TextField', [], {}), - 'usr': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['leave_tracker.UserProfile']"}) - }, - 'leave_tracker.leavecategory': { - 'Meta': {'object_name': 'LeaveCategory'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'number_of_days': ('django.db.models.fields.IntegerField', [], {'max_length': '10'}), - 'type_of_leave': ('django.db.models.fields.CharField', [], {'max_length': '20'}) - }, - 'leave_tracker.userprofile': { - 'Meta': {'object_name': 'UserProfile'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'leaves_taken': ('django.db.models.fields.PositiveIntegerField', [], {'max_length': '10'}), - 'total_leaves': ('django.db.models.fields.PositiveIntegerField', [], {'max_length': '10'}), - 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'}) - } - } - - complete_apps = ['leave_tracker'] - symmetrical = True diff --git a/leave_tracker/migrations/0006_auto__chg_field_leaveapplication_num_of_days.py b/leave_tracker/migrations/0006_auto__chg_field_leaveapplication_num_of_days.py deleted file mode 100644 index fe1ca35..0000000 --- a/leave_tracker/migrations/0006_auto__chg_field_leaveapplication_num_of_days.py +++ /dev/null @@ -1,83 +0,0 @@ -# -*- coding: utf-8 -*- -import 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 'LeaveApplication.num_of_days' - db.alter_column('leave_tracker_leaveapplication', 'num_of_days', self.gf('django.db.models.fields.IntegerField')(default=0)) - - def backwards(self, orm): - - # Changing field 'LeaveApplication.num_of_days' - db.alter_column('leave_tracker_leaveapplication', 'num_of_days', self.gf('django.db.models.fields.IntegerField')(null=True)) - - models = { - 'auth.group': { - 'Meta': {'object_name': 'Group'}, - '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': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) - }, - 'auth.permission': { - 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - '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', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), - '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', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - }, - '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'}), - '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'}) - }, - 'leave_tracker.leaveapplication': { - 'Meta': {'object_name': 'LeaveApplication'}, - 'end_date': ('django.db.models.fields.DateTimeField', [], {}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'leave_category': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['leave_tracker.LeaveCategory']"}), - 'num_of_days': ('django.db.models.fields.IntegerField', [], {}), - 'start_date': ('django.db.models.fields.DateTimeField', [], {}), - 'status': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'subject': ('django.db.models.fields.TextField', [], {}), - 'usr': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['leave_tracker.UserProfile']"}) - }, - 'leave_tracker.leavecategory': { - 'Meta': {'object_name': 'LeaveCategory'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'number_of_days': ('django.db.models.fields.IntegerField', [], {'max_length': '10'}), - 'type_of_leave': ('django.db.models.fields.CharField', [], {'max_length': '20'}) - }, - 'leave_tracker.userprofile': { - 'Meta': {'object_name': 'UserProfile'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'leaves_taken': ('django.db.models.fields.PositiveIntegerField', [], {'max_length': '10'}), - 'total_leaves': ('django.db.models.fields.PositiveIntegerField', [], {'max_length': '10'}), - 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'}) - } - } - - complete_apps = ['leave_tracker'] \ No newline at end of file diff --git a/leave_tracker/migrations/0007_auto__del_field_userprofile_leaves_taken.py b/leave_tracker/migrations/0007_auto__del_field_userprofile_leaves_taken.py deleted file mode 100644 index ad1651e..0000000 --- a/leave_tracker/migrations/0007_auto__del_field_userprofile_leaves_taken.py +++ /dev/null @@ -1,82 +0,0 @@ -# -*- coding: utf-8 -*- -import 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 'UserProfile.leaves_taken' - db.delete_column('leave_tracker_userprofile', 'leaves_taken') - - - def backwards(self, orm): - - # User chose to not deal with backwards NULL issues for 'UserProfile.leaves_taken' - raise RuntimeError("Cannot reverse this migration. 'UserProfile.leaves_taken' and its values cannot be restored.") - - models = { - 'auth.group': { - 'Meta': {'object_name': 'Group'}, - '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': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) - }, - 'auth.permission': { - 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - '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', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), - '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', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - }, - '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'}), - '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'}) - }, - 'leave_tracker.leaveapplication': { - 'Meta': {'object_name': 'LeaveApplication'}, - 'end_date': ('django.db.models.fields.DateTimeField', [], {}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'leave_category': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['leave_tracker.LeaveCategory']"}), - 'num_of_days': ('django.db.models.fields.IntegerField', [], {}), - 'start_date': ('django.db.models.fields.DateTimeField', [], {}), - 'status': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'subject': ('django.db.models.fields.TextField', [], {}), - 'usr': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['leave_tracker.UserProfile']"}) - }, - 'leave_tracker.leavecategory': { - 'Meta': {'object_name': 'LeaveCategory'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'number_of_days': ('django.db.models.fields.IntegerField', [], {'max_length': '10'}), - 'type_of_leave': ('django.db.models.fields.CharField', [], {'max_length': '20'}) - }, - 'leave_tracker.userprofile': { - 'Meta': {'object_name': 'UserProfile'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'total_leaves': ('django.db.models.fields.PositiveIntegerField', [], {'max_length': '10'}), - 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'}) - } - } - - complete_apps = ['leave_tracker'] \ No newline at end of file diff --git a/leave_tracker/migrations/0008_auto__add_field_leaveapplication_start_date_new__add_field_leaveapplic.py b/leave_tracker/migrations/0008_auto__add_field_leaveapplication_start_date_new__add_field_leaveapplic.py deleted file mode 100644 index 75bd552..0000000 --- a/leave_tracker/migrations/0008_auto__add_field_leaveapplication_start_date_new__add_field_leaveapplic.py +++ /dev/null @@ -1,94 +0,0 @@ -# -*- coding: utf-8 -*- -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - - -class Migration(SchemaMigration): - - def forwards(self, orm): - # Adding field 'LeaveApplication.start_date_new' - db.add_column('leave_tracker_leaveapplication', 'start_date_new', - self.gf('django.db.models.fields.DateField')(null=True, blank=True), - keep_default=False) - - # Adding field 'LeaveApplication.end_date_new' - db.add_column('leave_tracker_leaveapplication', 'end_date_new', - self.gf('django.db.models.fields.DateField')(null=True, blank=True), - keep_default=False) - - - def backwards(self, orm): - # Deleting field 'LeaveApplication.start_date_new' - db.delete_column('leave_tracker_leaveapplication', 'start_date_new') - - # Deleting field 'LeaveApplication.end_date_new' - db.delete_column('leave_tracker_leaveapplication', 'end_date_new') - - - models = { - 'auth.group': { - 'Meta': {'object_name': 'Group'}, - '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': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) - }, - 'auth.permission': { - 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - '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', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), - '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', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - }, - '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'}), - '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'}) - }, - 'leave_tracker.leaveapplication': { - 'Meta': {'object_name': 'LeaveApplication'}, - 'end_date': ('django.db.models.fields.DateTimeField', [], {}), - 'end_date_new': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'leave_category': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['leave_tracker.LeaveCategory']"}), - 'num_of_days': ('django.db.models.fields.IntegerField', [], {}), - 'start_date': ('django.db.models.fields.DateTimeField', [], {}), - 'start_date_new': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), - 'status': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'subject': ('django.db.models.fields.TextField', [], {}), - 'usr': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['leave_tracker.UserProfile']"}) - }, - 'leave_tracker.leavecategory': { - 'Meta': {'object_name': 'LeaveCategory'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'number_of_days': ('django.db.models.fields.IntegerField', [], {'max_length': '10'}), - 'type_of_leave': ('django.db.models.fields.CharField', [], {'max_length': '20'}) - }, - 'leave_tracker.userprofile': { - 'Meta': {'object_name': 'UserProfile'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'total_leaves': ('django.db.models.fields.PositiveIntegerField', [], {'max_length': '10'}), - 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'}) - } - } - - complete_apps = ['leave_tracker'] \ No newline at end of file diff --git a/leave_tracker/migrations/0009_modify_datetime_fields.py b/leave_tracker/migrations/0009_modify_datetime_fields.py deleted file mode 100644 index 04bc79c..0000000 --- a/leave_tracker/migrations/0009_modify_datetime_fields.py +++ /dev/null @@ -1,98 +0,0 @@ -# -*- coding: utf-8 -*- -import datetime -from south.db import db -from south.v2 import DataMigration -from django.db import models -import pytz - -class Migration(DataMigration): - - def forwards(self, orm): - "Write your forwards methods here." - # Note: Remember to use orm['appname.ModelName'] rather than "from appname.models..." - LeaveApplication = orm['leave_tracker.LeaveApplication'] - leaves = LeaveApplication.objects.all() - for leave in leaves: - - timezone = pytz.timezone('Asia/Kolkata') - start_date = leave.start_date.replace(tzinfo=pytz.utc) - end_date = leave.end_date.replace(tzinfo=pytz.utc) - - leave.start_date_new = datetime.datetime.astimezone( - start_date, timezone - ).date() - leave.end_date_new = datetime.datetime.astimezone( - end_date, timezone - ).date() - - leave.save() - - def backwards(self, orm): - "Write your backwards methods here." - - models = { - 'auth.group': { - 'Meta': {'object_name': 'Group'}, - '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': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) - }, - 'auth.permission': { - 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - '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', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), - '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', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - }, - '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'}), - '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'}) - }, - 'leave_tracker.leaveapplication': { - 'Meta': {'object_name': 'LeaveApplication'}, - 'end_date': ('django.db.models.fields.DateTimeField', [], {}), - 'end_date_new': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'leave_category': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['leave_tracker.LeaveCategory']"}), - 'num_of_days': ('django.db.models.fields.IntegerField', [], {}), - 'start_date': ('django.db.models.fields.DateTimeField', [], {}), - 'start_date_new': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), - 'status': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'subject': ('django.db.models.fields.TextField', [], {}), - 'usr': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['leave_tracker.UserProfile']"}) - }, - 'leave_tracker.leavecategory': { - 'Meta': {'object_name': 'LeaveCategory'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'number_of_days': ('django.db.models.fields.IntegerField', [], {'max_length': '10'}), - 'type_of_leave': ('django.db.models.fields.CharField', [], {'max_length': '20'}) - }, - 'leave_tracker.userprofile': { - 'Meta': {'object_name': 'UserProfile'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'total_leaves': ('django.db.models.fields.PositiveIntegerField', [], {'max_length': '10'}), - 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'}) - } - } - - complete_apps = ['leave_tracker'] - symmetrical = True diff --git a/leave_tracker/migrations/0010_auto__del_field_leaveapplication_end_date__del_field_leaveapplication_.py b/leave_tracker/migrations/0010_auto__del_field_leaveapplication_end_date__del_field_leaveapplication_.py deleted file mode 100644 index 9456865..0000000 --- a/leave_tracker/migrations/0010_auto__del_field_leaveapplication_end_date__del_field_leaveapplication_.py +++ /dev/null @@ -1,88 +0,0 @@ -# -*- coding: utf-8 -*- -import 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 'LeaveApplication.end_date' - db.delete_column('leave_tracker_leaveapplication', 'end_date') - - # Deleting field 'LeaveApplication.start_date' - db.delete_column('leave_tracker_leaveapplication', 'start_date') - - - def backwards(self, orm): - - # User chose to not deal with backwards NULL issues for 'LeaveApplication.end_date' - raise RuntimeError("Cannot reverse this migration. 'LeaveApplication.end_date' and its values cannot be restored.") - - # User chose to not deal with backwards NULL issues for 'LeaveApplication.start_date' - raise RuntimeError("Cannot reverse this migration. 'LeaveApplication.start_date' and its values cannot be restored.") - - models = { - 'auth.group': { - 'Meta': {'object_name': 'Group'}, - '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': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) - }, - 'auth.permission': { - 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - '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', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), - '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', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - }, - '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'}), - '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'}) - }, - 'leave_tracker.leaveapplication': { - 'Meta': {'object_name': 'LeaveApplication'}, - 'end_date_new': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'leave_category': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['leave_tracker.LeaveCategory']"}), - 'num_of_days': ('django.db.models.fields.IntegerField', [], {}), - 'start_date_new': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), - 'status': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'subject': ('django.db.models.fields.TextField', [], {}), - 'usr': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['leave_tracker.UserProfile']"}) - }, - 'leave_tracker.leavecategory': { - 'Meta': {'object_name': 'LeaveCategory'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'number_of_days': ('django.db.models.fields.IntegerField', [], {'max_length': '10'}), - 'type_of_leave': ('django.db.models.fields.CharField', [], {'max_length': '20'}) - }, - 'leave_tracker.userprofile': { - 'Meta': {'object_name': 'UserProfile'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'total_leaves': ('django.db.models.fields.PositiveIntegerField', [], {'max_length': '10'}), - 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'}) - } - } - - complete_apps = ['leave_tracker'] \ No newline at end of file diff --git a/leave_tracker/migrations/0011_auto__del_field_leaveapplication_start_date_new__del_field_leaveapplic.py b/leave_tracker/migrations/0011_auto__del_field_leaveapplication_start_date_new__del_field_leaveapplic.py deleted file mode 100644 index 75a7e26..0000000 --- a/leave_tracker/migrations/0011_auto__del_field_leaveapplication_start_date_new__del_field_leaveapplic.py +++ /dev/null @@ -1,82 +0,0 @@ -# -*- coding: utf-8 -*- -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - - -class Migration(SchemaMigration): - - def forwards(self, orm): - db.rename_column('leave_tracker_leaveapplication', 'end_date_new', 'end_date') - db.rename_column('leave_tracker_leaveapplication', 'start_date_new', 'start_date') - - - def backwards(self, orm): - db.rename_column('leave_tracker_leaveapplication', 'end_date', 'end_date_new') - db.rename_column('leave_tracker_leaveapplication', 'start_date', 'start_date_new') - - - models = { - 'auth.group': { - 'Meta': {'object_name': 'Group'}, - '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': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) - }, - 'auth.permission': { - 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - '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', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), - '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', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - }, - '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'}), - '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'}) - }, - 'leave_tracker.leaveapplication': { - 'Meta': {'object_name': 'LeaveApplication'}, - 'end_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'leave_category': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['leave_tracker.LeaveCategory']"}), - 'num_of_days': ('django.db.models.fields.IntegerField', [], {}), - 'start_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), - 'status': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'subject': ('django.db.models.fields.TextField', [], {}), - 'usr': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['leave_tracker.UserProfile']"}) - }, - 'leave_tracker.leavecategory': { - 'Meta': {'object_name': 'LeaveCategory'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'number_of_days': ('django.db.models.fields.IntegerField', [], {'max_length': '10'}), - 'type_of_leave': ('django.db.models.fields.CharField', [], {'max_length': '20'}) - }, - 'leave_tracker.userprofile': { - 'Meta': {'object_name': 'UserProfile'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'total_leaves': ('django.db.models.fields.PositiveIntegerField', [], {'max_length': '10'}), - 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'}) - } - } - - complete_apps = ['leave_tracker'] diff --git a/leave_tracker/migrations/0012_auto__chg_field_leaveapplication_end_date__chg_field_leaveapplication_.py b/leave_tracker/migrations/0012_auto__chg_field_leaveapplication_end_date__chg_field_leaveapplication_.py deleted file mode 100644 index 3c2431d..0000000 --- a/leave_tracker/migrations/0012_auto__chg_field_leaveapplication_end_date__chg_field_leaveapplication_.py +++ /dev/null @@ -1,88 +0,0 @@ -# -*- coding: utf-8 -*- -import 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 'LeaveApplication.end_date' - db.alter_column('leave_tracker_leaveapplication', 'end_date', self.gf('django.db.models.fields.DateField')(default=datetime.datetime(2013, 5, 15).date())) - - # Changing field 'LeaveApplication.start_date' - db.alter_column('leave_tracker_leaveapplication', 'start_date', self.gf('django.db.models.fields.DateField')(default=datetime.datetime(2013, 5, 15).date())) - - def backwards(self, orm): - - # Changing field 'LeaveApplication.end_date' - db.alter_column('leave_tracker_leaveapplication', 'end_date', self.gf('django.db.models.fields.DateField')(null=True)) - - # Changing field 'LeaveApplication.start_date' - db.alter_column('leave_tracker_leaveapplication', 'start_date', self.gf('django.db.models.fields.DateField')(null=True)) - - models = { - 'auth.group': { - 'Meta': {'object_name': 'Group'}, - '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': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) - }, - 'auth.permission': { - 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - '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', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), - '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', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - }, - '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'}), - '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'}) - }, - 'leave_tracker.leaveapplication': { - 'Meta': {'object_name': 'LeaveApplication'}, - 'end_date': ('django.db.models.fields.DateField', [], {}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'leave_category': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['leave_tracker.LeaveCategory']"}), - 'num_of_days': ('django.db.models.fields.IntegerField', [], {}), - 'start_date': ('django.db.models.fields.DateField', [], {}), - 'status': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'subject': ('django.db.models.fields.TextField', [], {}), - 'usr': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['leave_tracker.UserProfile']"}) - }, - 'leave_tracker.leavecategory': { - 'Meta': {'object_name': 'LeaveCategory'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'number_of_days': ('django.db.models.fields.IntegerField', [], {'max_length': '10'}), - 'type_of_leave': ('django.db.models.fields.CharField', [], {'max_length': '20'}) - }, - 'leave_tracker.userprofile': { - 'Meta': {'object_name': 'UserProfile'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'total_leaves': ('django.db.models.fields.PositiveIntegerField', [], {'max_length': '10'}), - 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'}) - } - } - - complete_apps = ['leave_tracker'] diff --git a/leave_tracker/migrations/0013_update_num_of_days.py b/leave_tracker/migrations/0013_update_num_of_days.py deleted file mode 100644 index c656a09..0000000 --- a/leave_tracker/migrations/0013_update_num_of_days.py +++ /dev/null @@ -1,94 +0,0 @@ -# -*- coding: utf-8 -*- -import datetime -from datetime import timedelta -from south.db import db -from south.v2 import DataMigration -from django.db import models -from django.conf import settings - -class Migration(DataMigration): - - def forwards(self, orm): - "Write your forwards methods here." - # Note: Remember to use orm['appname.ModelName'] rather than "from appname.models..." - LeaveApplication = orm['leave_tracker.LeaveApplication'] - leaves = LeaveApplication.objects.all() - holidays = settings.WEEKEND_HOLIDAYS - for leave in leaves: - - start = leave.start_date - end = leave.end_date - dg = (start + timedelta(x+1) for x in xrange((end-start).days)) - s = sum(1 for day in dg if day.weekday() not in holidays) - if start.weekday() < 5: - s += 1 - leave.num_of_days = s - leave.save() - - def backwards(self, orm): - "Write your backwards methods here." - - models = { - 'auth.group': { - 'Meta': {'object_name': 'Group'}, - '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': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) - }, - 'auth.permission': { - 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - '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', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), - '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', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - }, - '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'}), - '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'}) - }, - 'leave_tracker.leaveapplication': { - 'Meta': {'object_name': 'LeaveApplication'}, - 'end_date': ('django.db.models.fields.DateField', [], {}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'leave_category': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['leave_tracker.LeaveCategory']"}), - 'num_of_days': ('django.db.models.fields.IntegerField', [], {}), - 'start_date': ('django.db.models.fields.DateField', [], {}), - 'status': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'subject': ('django.db.models.fields.TextField', [], {}), - 'usr': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['leave_tracker.UserProfile']"}) - }, - 'leave_tracker.leavecategory': { - 'Meta': {'object_name': 'LeaveCategory'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'number_of_days': ('django.db.models.fields.IntegerField', [], {'max_length': '10'}), - 'type_of_leave': ('django.db.models.fields.CharField', [], {'max_length': '20'}) - }, - 'leave_tracker.userprofile': { - 'Meta': {'object_name': 'UserProfile'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'total_leaves': ('django.db.models.fields.PositiveIntegerField', [], {'max_length': '10'}), - 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'}) - } - } - - complete_apps = ['leave_tracker'] - symmetrical = True diff --git a/leave_tracker/models.py b/leave_tracker/models.py index 9f34a59..8cc9d58 100644 --- a/leave_tracker/models.py +++ b/leave_tracker/models.py @@ -6,7 +6,7 @@ from django.core.mail import send_mail from django.conf import settings from django.template.loader import render_to_string - +from django.core.validators import MaxValueValidator from datetime import timedelta @@ -14,7 +14,7 @@ class LeaveCategory(models.Model): "The type of leaves. Eg Casual leave, medical leave" type_of_leave = models.CharField(max_length=20) - number_of_days = models.IntegerField(max_length=10) + number_of_days = models.PositiveIntegerField(validators=[MaxValueValidator(9999999999)]) class Meta: verbose_name_plural = "Leave Categories" @@ -26,7 +26,7 @@ def __unicode__(self): class UserProfile(models.Model): "Data we need for a user" user = models.OneToOneField(User) - total_leaves = models.PositiveIntegerField(max_length=10) + total_leaves = models.PositiveIntegerField(validators=[MaxValueValidator(9999999999)]) def __unicode__(self): return self.user.username diff --git a/leave_tracker/templates/leave_tracker/base.html b/leave_tracker/templates/leave_tracker/base.html index 6c416d7..4647e37 100644 --- a/leave_tracker/templates/leave_tracker/base.html +++ b/leave_tracker/templates/leave_tracker/base.html @@ -37,7 +37,7 @@ {% endif %}
  • Logout
    • {% else %} -
  • Login
    • +
  • Login
    • {% endif %} diff --git a/leave_tracker/templates/leave_tracker/index.html b/leave_tracker/templates/leave_tracker/index.html index b0e7fb2..a155147 100644 --- a/leave_tracker/templates/leave_tracker/index.html +++ b/leave_tracker/templates/leave_tracker/index.html @@ -1,6 +1,5 @@ {% extends "leave_tracker/base.html" %} -{% load url from future %} {% load leave_tracker_tags %} {% block content %} @@ -24,7 +23,7 @@

    You have exhausted {{ current_user|leaves_taken }} {% else %} - Login +
  • Login
    • {% endif %}

    diff --git a/leave_tracker/urls.py b/leave_tracker/urls.py index 303901f..809636f 100644 --- a/leave_tracker/urls.py +++ b/leave_tracker/urls.py @@ -5,7 +5,6 @@ url(r'^apply/$', 'apply', name='apply'), url(r'^all/$', 'all', name='all'), url(r'^personal/$', 'personal', name='personal'), - url(r'^openid/', include('django_openid_auth.urls')), url(r'^openid/logout/$', 'oidlogout', name='oidlogout'), url(r'^get_prev_leaves/', 'get_prev_leaves', name='get_prev_leaves'), ) diff --git a/leaves/settings.py b/leaves/settings.py index e7318ac..4057d66 100644 --- a/leaves/settings.py +++ b/leaves/settings.py @@ -8,9 +8,9 @@ MANAGERS = ADMINS PROJECT_DIR=os.path.dirname(__file__) -SERVER_EMAIL = 'leaves@agiliq.com' -LEAVE_TRACKER_FROM_MAIL = 'leaves@agiliq.com' -LEAVE_TRACKER_RECIPIENT = 'shabda@agiliq.com' +SERVER_EMAIL = 'yashwanthbabu.gujarathi@gmail.com' +LEAVE_TRACKER_FROM_MAIL = 'yashwanthbabu.gujarathi@gmail.com' +LEAVE_TRACKER_RECIPIENT = 'yashwanth@agiliq.com' # Local time zone for this installation. Choices can be found here: # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name @@ -51,7 +51,7 @@ # Don't put anything in this directory yourself; store your static files # in apps' "static/" subdirectories and in STATICFILES_DIRS. # Example: "/home/media/media.lawrence.com/static/" -STATIC_ROOT = PROJECT_DIR+'/static' +STATIC_ROOT = PROJECT_DIR+'/staticfiles' # URL prefix for static files. # Example: "http://media.lawrence.com/static/" @@ -60,7 +60,7 @@ # Additional locations of static files STATICFILES_DIRS = ( - #os.path.join(PROJECT_DIR,'static/'), + os.path.join(PROJECT_DIR,'static'), # Put strings here, like "/home/html/static" or "C:/www/django/static". # Always use forward slashes, even on Windows. # Don't forget to use absolute paths, not relative paths. @@ -114,16 +114,18 @@ 'django.contrib.messages', 'django.contrib.staticfiles', 'leave_tracker', - 'south', - 'django_openid_auth', 'django.contrib.admin', + 'social.apps.django_app.default', ) AUTHENTICATION_BACKENDS = ( - 'django_openid_auth.auth.OpenIDBackend', + 'social.backends.google.GoogleOAuth2', 'django.contrib.auth.backends.ModelBackend', ) +SOCIAL_AUTH_GOOGLE_OAUTH2_KEY = os.environ.get('SOCIAL_AUTH_GOOGLE_OAUTH2_KEY') +SOCIAL_AUTH_GOOGLE_OAUTH2_SECRET = os.environ.get('SOCIAL_AUTH_GOOGLE_OAUTH2_SECRET') + # Should users be created when new OpenIDs are used to log in? OPENID_CREATE_USERS = True @@ -193,3 +195,10 @@ WEEKEND_HOLIDAYS = [5, 6] # Monday - 0, Sunday - 6. + +EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend' +EMAIL_HOST = 'smtp.gmail.com' +EMAIL_HOST_USER = os.environ.get('EMAIL_HOST_USER') +EMAIL_HOST_PASSWORD = os.environ.get('EMAIL_HOST_PASSWORD') +EMAIL_PORT = 587 +EMAIL_USE_TLS = True diff --git a/leaves/urls.py b/leaves/urls.py index 3f3d656..73ddd43 100644 --- a/leaves/urls.py +++ b/leaves/urls.py @@ -13,6 +13,8 @@ # Uncomment the next line to enable the admin: url(r'^admin/', include(admin.site.urls)), + url('google_auth/', include('social.apps.django_app.urls', namespace='social')), + url('google_auth/login/google-oauth2/', 'social.apps.django_app.views.auth', name='login'), ) urlpatterns += staticfiles_urlpatterns() diff --git a/requirements.txt b/requirements.txt index cc094bb..6a94788 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,10 +1,9 @@ -Django==1.5.2 +Django==1.9.9 MySQL-python==1.2.5 -South==0.8.2 argparse==1.2.1 -django-openid-auth==0.5 gunicorn==18.0 -e git+https://github.com/adieu/python-openid@03773fb96dff352bbda12538726dc5c46fe0316c#egg=python_openid-dev pytz==2013b wsgiref==0.1.2 django-parsley==0.0.2a0 +python-social-auth==0.2.19