Add temporary data import

7 files changed, 26 insertions, 18 deletions

diff --git a/web/apps/test_records/models.py b/web/apps/test_records/models.py
index 4332470..a1813db 100644
--- a/web/apps/test_records/models.py
+++ b/web/apps/test_records/models.py
@@ -107,9 +107,9 @@ class TestDataSet(models.Model):
     test_cate = models.ForeignKey(TestCategory, verbose_name="test cate id", help_text="test cate id")
     clients = models.IntegerField(verbose_name="clients", help_text="clients of the test dataset")
     scale = models.IntegerField(verbose_name="scale", help_text="scale of the test dataset")
-    std = models.DecimalField(max_digits=16, decimal_places=6, verbose_name="std",help_text="std of the test dataset")
-    metric = models.DecimalField(max_digits=16, decimal_places=6, verbose_name="metric",help_text="metric of the test dataset")
-    median = models.DecimalField(max_digits=16, decimal_places=6, verbose_name="median",help_text="median of the test dataset")
+    std = models.DecimalField(max_digits=18, decimal_places=8, verbose_name="std",help_text="std of the test dataset")
+    metric = models.DecimalField(max_digits=18, decimal_places=8, verbose_name="metric",help_text="metric of the test dataset")
+    median = models.DecimalField(max_digits=18, decimal_places=8, verbose_name="median",help_text="median of the test dataset")
 
     STATUS_CHOICE = (
         (-1, 'none'),
diff --git a/web/apps/test_records/views.py b/web/apps/test_records/views.py
index 5ed8b93..8572c85 100644
--- a/web/apps/test_records/views.py
+++ b/web/apps/test_records/views.py
@@ -113,16 +113,16 @@ def TestRecordCreate(request, format=None):
             print 'std is:'+ str(dataset['std'])
 
             test_dataset_data = {
-                'test_record_id': testRecordRet.id,
+                'test_record': testRecordRet.id,
                 'clients': client_num,
                 'scale': scale,
                 'std': dataset['std'],
                 'metric': dataset['metric'],
                 'median': dataset['median'],
+                'test_cate': 1,
                 # todo status,percentage
                 'status': 1,
                 'percentage': 0.062,
-                'test_cate_id': 1,
             }
             testDateSet = CreateTestDateSetSerializer(data=test_dataset_data)
             testDateSetRet = None
diff --git a/web/db_tools/import_alias_data.py b/web/db_tools/import_alias_data.py
index 5365aca..d347f34 100644
--- a/web/db_tools/import_alias_data.py
+++ b/web/db_tools/import_alias_data.py
@@ -3,14 +3,16 @@ import os
 
 # Use django's model independently
 pwd = os.path.dirname(os.path.realpath(__file__))
-sys.path.append(pwd+ "../")
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "pgperffarm.settings")
+sys.path.append(pwd)
+path = 'D:\GitSpace\pgperffarm\web\pgperffarm'
+sys.path.append(path)
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings")
 
 # Initialize django
 import django
 django.setup()
 
-from apps.users.models import Alias
+from users.models import Alias
 from data.alias_data import row_data
 
 for alias_item in row_data:
diff --git a/web/db_tools/import_category_data.py b/web/db_tools/import_category_data.py
index 7b8f942..33fcf88 100644
--- a/web/db_tools/import_category_data.py
+++ b/web/db_tools/import_category_data.py
@@ -4,14 +4,15 @@ import os
 # Use django's model independently
 pwd = os.path.dirname(os.path.realpath(__file__))
 sys.path.append(pwd+ "../")
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "PerfFarm.settings")
+path = 'D:\GitSpace\pgperffarm\web\pgperffarm'
+sys.path.append(path)
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings")
 
 # Initialize django
 import django
 django.setup()
 
-# todo
-from apps.test_records.models import TestCategory
+from test_records.models import TestCategory
 from data.category_data import row_data
 from django.contrib.auth.hashers import make_password
 
diff --git a/web/db_tools/import_machine_data.py b/web/db_tools/import_machine_data.py
index 115f840..1b518d6 100644
--- a/web/db_tools/import_machine_data.py
+++ b/web/db_tools/import_machine_data.py
@@ -4,13 +4,17 @@ import os
 # Use django's model independently
 pwd = os.path.dirname(os.path.realpath(__file__))
 sys.path.append(pwd+ "../")
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "PerfFarm.settings")
+path = 'D:\GitSpace\pgperffarm\web\pgperffarm'
+sys.path.append(path)
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings")
 
 # Initialize django
 import django
 django.setup()
 
 from apps.user_operation.models import UserMachine
+# cannot use 'apps.users.models'
+from users.models import Alias
 from data.machine_data import row_data
 from django.contrib.auth.hashers import make_password
 
@@ -19,7 +23,7 @@ for machine_item in row_data:
 
     machine.machine_sn = machine_item["machine_sn"]
     machine.machine_secret = machine_item["machine_secret"]
-    machine.alias = machine_item["alias"]
+    machine.alias = Alias.objects.get(id=machine_item["alias"])
     machine.os_name = machine_item["os_name"]
     machine.os_version = machine_item["os_version"]
     machine.comp_name = machine_item["comp_name"]
diff --git a/web/db_tools/import_user_data.py b/web/db_tools/import_user_data.py
index d06547a..ee83e16 100644
--- a/web/db_tools/import_user_data.py
+++ b/web/db_tools/import_user_data.py
@@ -4,14 +4,15 @@ import os
 # Use django's model independently
 pwd = os.path.dirname(os.path.realpath(__file__))
 sys.path.append(pwd+ "../")
-
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "pgperffarm.settings")
+path = 'D:\GitSpace\pgperffarm\web\pgperffarm'
+sys.path.append(path)
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings")
 
 # Initialize django
 import django
 django.setup()
 
-from apps.users.models import UserProfile
+from users.models import UserProfile
 from data.user_data import row_data
 from django.contrib.auth.hashers import make_password
 
diff --git a/web/pgperffarm/settings.py b/web/pgperffarm/settings.py
index 0cd5b2d..b4d34a0 100644
--- a/web/pgperffarm/settings.py
+++ b/web/pgperffarm/settings.py
@@ -3,7 +3,7 @@ import os
 import sys
 
 # Load local settings overrides
-from .settings_local import *
+from settings_local import *
 
 """
 Django settings for pgperfarm project.
@@ -49,7 +49,7 @@ INSTALLED_APPS = (
     'rest_framework.authtoken',
     'users',
     'test_records',
-    'user_operation'
+    'user_operation',
 )
 
 MIDDLEWARE_CLASSES = (