--- a/OSSEval/analysis/models.py
+++ b/OSSEval/analysis/models.py
@@ -1,11 +1,14 @@
+from datetime import datetime
+
from django.db import models
+
from methodology.models import WeightScenario
class Analysis(models.Model):
name = models.CharField(max_length=200)
description = models.CharField(max_length=2000)
comment = models.TextField(null=True,blank=True)
- created = models.DateField()
+ created = models.DateField(default=datetime.now, blank=True)
methodology_version = models.ForeignKey('methodology.MethodologyVersion')
user_login = models.CharField(max_length=50)
visible = models.BooleanField(default=True)
@@ -17,19 +20,15 @@
#All but the MethodologyVersion so that we can independently import from xml MethodologyVersion and Analysis
pass
def to_xml(self):
- str_xml = "<Id>" + str(self.id) + "</Id>"
- str_xml += "<Name>" + self.name + "</Name>"
- str_xml += "<Description>" + self.description + "</Description>"
+ str_xml = "<Description>" + self.description + "</Description>"
str_xml += "<Comment>" + self.comment + "</Comment>"
- str_xml += "<Created>" + str(self.created) + "</Created>"
- str_xml += "<UserLogin>" + self.user_login + "</UserLogin>"
str_xml += self.weight_scenario.to_xml()
str_xml += "<Instances>"
for instance in self.instance_set.all():
str_xml += instance.to_xml()
str_xml += "</Instances>"
- return "<Analysis>" + str_xml + "</Analysis>"
+ return '<Analysis Id="' + str(self.id) + '" Name="' + self.name + '" Created="' + str(self.created) + '" UserLogin="' + self.user_login + '">' + str_xml + "</Analysis>"
class Instance(models.Model):
"""
@@ -43,15 +42,12 @@
def from_xml(self, xmldoc, insert = True):
pass
def to_xml(self):
- str_xml = "<Id>" + str(self.id) + "</Id>"
- str_xml += "<Name>" + self.name + "</Name>"
- str_xml += "<NameForSearch>" + self.name_for_search + "</NameForSearch>"
- str_xml += "<Answers>"
+ str_xml = "<Answers>"
for answer in self.answer_set.all():
str_xml += answer.to_xml()
str_xml += "</Answers>"
- return "<Instance>" + str_xml + "</Instance>"
+ return '<Instance Id="' + str(self.id) + '" Name="' + self.name + '" NameForSearch="' + self.name_for_search + '">' + str_xml + "</Instance>"
class Answer(models.Model):
"""
@@ -64,12 +60,14 @@
def from_xml(self, xmldoc, insert = True):
pass
def to_xml(self):
- str_xml = "<Id>" + str(self.id) + "</Id>"
- str_xml += "<ValueInteger>" + self.value_integer + "</ValueInteger>"
- str_xml += "<Notes>" + self.notes + "</Notes>"
- str_xml += "<Question><Id>" + str(self.question.id) + "</Id></Question>"
+ str_xml = "<Notes>" + self.notes + "</Notes>"
+ str_xml += '<Question Id="' + str(self.question.id) + '"></Question>'
- return "<Answer>" + str_xml + "</Answer>"
+ return '<Answer ValueInteger="' + str(self.value_integer) + '">' + str_xml + "</Answer>"
+
+class Configuration(models.Model):
+ default_methodology_version = models.ForeignKey('methodology.MethodologyVersion', blank=True, null=True)
+
class UploadedFile(models.Model):
'''