refactor fix -> models.py / AbstractCRUD.py
parent
c463e42009
commit
6a32881c6a
|
|
@ -33,25 +33,25 @@ def getExchangeGraph(request, time):
|
||||||
return ExchangeVO.getGraphView(request, time)
|
return ExchangeVO.getGraphView(request, time)
|
||||||
|
|
||||||
def getTrigger(request, id):
|
def getTrigger(request, id):
|
||||||
return Triggers.getObject(request, id, 1)
|
return Triggers.getObject(id)
|
||||||
|
|
||||||
def getTransaction(request, id):
|
def getTransaction(request, id):
|
||||||
return Transactions.getObject(request, id, 1)
|
return Transactions.getObject(id)
|
||||||
|
|
||||||
def getUserTriggers(request, userID):
|
def getUserTriggers(request, userID):
|
||||||
return Triggers.getObjectsByParentID(request, userID, 1)
|
return Triggers.getObjectsByParentID(userID)
|
||||||
|
|
||||||
def getUserTransactions(request, userID):
|
def getUserTransactions(request, userID):
|
||||||
return Transactions.getObjectByParentID(request, userID, 1)
|
return Transactions.getObjectsByParentID(userID)
|
||||||
|
|
||||||
def getTriggersAll(request):
|
def getTriggersAll(request):
|
||||||
return Triggers.getAllObjects(request, 2)
|
return Triggers.getAllObjects()
|
||||||
|
|
||||||
def getTransactionsAll(request):
|
def getTransactionsAll(request):
|
||||||
return Transactions.getAllObjects(request, 2)
|
return Transactions.getAllObjects()
|
||||||
|
|
||||||
def getUserNotifications(request, userID):
|
def getUserNotifications(request, userID):
|
||||||
return Notifications.getObjectsByParentID(request, userID, 1)
|
return Notifications.getObjectsByParentID(userID)
|
||||||
|
|
||||||
# Exchange PUT Methods
|
# Exchange PUT Methods
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -267,10 +267,6 @@ class Subjects(AbstractCRUD):
|
||||||
newComment.fromDict(objectDict['comment'])
|
newComment.fromDict(objectDict['comment'])
|
||||||
newComment.save()
|
newComment.save()
|
||||||
|
|
||||||
# Update Subject
|
|
||||||
|
|
||||||
# Delete Subject
|
|
||||||
|
|
||||||
|
|
||||||
class Comments(AbstractCRUD):
|
class Comments(AbstractCRUD):
|
||||||
text = models.CharField(max_length=1000)
|
text = models.CharField(max_length=1000)
|
||||||
|
|
@ -409,7 +405,7 @@ class Triggers(AbstractCRUD):
|
||||||
self.date_of_trigger = str(datetime.now().strftime("%Y-%d-%m %H:%M"))
|
self.date_of_trigger = str(datetime.now().strftime("%Y-%d-%m %H:%M"))
|
||||||
|
|
||||||
|
|
||||||
class Notifications(ObjectAbstract):
|
class Notifications(AbstractCRUD):
|
||||||
message = models.CharField(max_length=255)
|
message = models.CharField(max_length=255)
|
||||||
user = models.ForeignKey(Users, on_delete = models.CASCADE)
|
user = models.ForeignKey(Users, on_delete = models.CASCADE)
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue