Skip to content
This repository was archived by the owner on Dec 5, 2023. It is now read-only.

Commit 2d81c8d

Browse files
authored
Remove most of tracking and gl_tracking apps (#651)
* Enable language edit * Destroy links to tracking and gl_tracking apps * Delete views, forms, urls, and their tests for tracking and gl_tracking apps * Remove business logic from tracking and gl_tracking models * Increase test coverage for code that Vicky wrote * Fix flake8 error
1 parent 951c050 commit 2d81c8d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+312
-6994
lines changed

td/gl_tracking/forms.py

Lines changed: 0 additions & 57 deletions
This file was deleted.

td/gl_tracking/models.py

Lines changed: 24 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@
33
import datetime
44

55
from django.contrib.auth.models import User
6-
from django.utils import timezone
6+
# from django.utils import timezone
77
from django.utils.encoding import python_2_unicode_compatible
88
from django.db import models
9-
from django.core.urlresolvers import reverse
109

1110

1211
# ----------- #
@@ -59,9 +58,9 @@ class Document(models.Model):
5958
def __str__(self):
6059
return self.name
6160

62-
@classmethod
63-
def total_words(cls, phase):
64-
return sum(cls.objects.filter(category__phase__number=phase, is_active=True).values_list("words", flat=True))
61+
# @classmethod
62+
# def total_words(cls, phase):
63+
# return sum(cls.objects.filter(category__phase__number=phase, is_active=True).values_list("words", flat=True))
6564

6665

6766
# -------------- #
@@ -103,12 +102,12 @@ class Progress(models.Model):
103102
def __str__(self):
104103
return str(self.type)
105104

106-
def save(self, *args, **kwargs):
107-
""" Update Timestamp on save """
108-
if not self.id:
109-
self.created_at = timezone.now()
110-
self.modified_at = timezone.now()
111-
return super(Progress, self).save(*args, **kwargs)
105+
# def save(self, *args, **kwargs):
106+
# """ Update Timestamp on save """
107+
# if not self.id:
108+
# self.created_at = timezone.now()
109+
# self.modified_at = timezone.now()
110+
# return super(Progress, self).save(*args, **kwargs)
112111

113112
class Meta:
114113
unique_together = ("language", "type")
@@ -140,15 +139,12 @@ class Partner(models.Model):
140139
def __str__(self):
141140
return self.name
142141

143-
def save(self, *args, **kwargs):
144-
# The "default" arg in DateField() seems to only work for existing record, not new ones.
145-
# There's need to set initial value in the form after this.
146-
if self.partner_start is None:
147-
self.partner_start = datetime.date(1900, 1, 1)
148-
super(Partner, self).save(*args, **kwargs)
149-
150-
def get_absolute_url(self):
151-
return reverse("gl:partner_detail_view", kwargs={"pk": self.pk})
142+
# def save(self, *args, **kwargs):
143+
# # The "default" arg in DateField() seems to only work for existing record, not new ones.
144+
# # There's need to set initial value in the form after this.
145+
# if self.partner_start is None:
146+
# self.partner_start = datetime.date(1900, 1, 1)
147+
# super(Partner, self).save(*args, **kwargs)
152148

153149

154150
# ------------ #
@@ -175,11 +171,11 @@ class GLDirector(models.Model):
175171
def __str__(self):
176172
return self.user.username
177173

178-
@property
179-
def name(self):
180-
full_name = " ".join([self.user.first_name, self.user.last_name])
181-
return full_name if full_name != " " else self.user.username
182-
183-
@classmethod
184-
def super_gl_directors(cls):
185-
return [d.user.username for d in cls.objects.filter(is_super=True)]
174+
# @property
175+
# def name(self):
176+
# full_name = " ".join([self.user.first_name, self.user.last_name])
177+
# return full_name if full_name != " " else self.user.username
178+
#
179+
# @classmethod
180+
# def super_gl_directors(cls):
181+
# return [d.user.username for d in cls.objects.filter(is_super=True)]

td/gl_tracking/urls.py

Lines changed: 0 additions & 28 deletions
This file was deleted.

td/gl_tracking/views.py

Lines changed: 0 additions & 196 deletions
This file was deleted.

td/settings.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,6 @@
234234
EMAIL_FROM = "uwadmin@unfoldingword.org"
235235

236236
EMAIL_BACKEND = "django.core.mail.backends.console.EmailBackend"
237-
# EMAIL_BACKEND = "django.core.mail.backends.smtp.EmailBackend"
238237

239238
ACCOUNT_OPEN_SIGNUP = False
240239
ACCOUNT_EMAIL_UNIQUE = True
@@ -275,8 +274,3 @@
275274
"key": os.environ.get("PORT_API_KEY"),
276275
}
277276
]
278-
279-
HOMEPAGE_MESSAGE = "The ability to create and update Languages, WA Regions, Countries, Charters, Events, and Partners " \
280-
"will be suspended for all users starting on Monday, Jan. 9, 2017. These functions will be made " \
281-
"available in the new system, which is launching in a couple of weeks. Please retain the " \
282-
"information you want to enter until then."

0 commit comments

Comments
 (0)