merged dev into statistical forcsating. mostly working #223

SEC-i · May 14, 2014 · 37e5155 · 37e5155
1 parent 8de3670
commit 37e5155
Show file tree

Hide file tree

Showing 131 changed files with 6,087 additions and 4,684 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,3 @@
-/simulation/server/data/exports/*
-!/simulation/server/data/exports/example.json
 
 *.py[cod]
 *.py~
@@ -37,11 +35,15 @@ nosetests.xml
 .project
 .pydevproject
 
+*.log
+*.db
+
 *sftp-config.json
 *sftp-config-alt.json
 
 *.sublime-workspace
 *.sublime-project
-*.log
 
-sftp-config-alt2.json
+
+
+sftp-config-alt2.json
diff --git a/.gitmodules b/.gitmodules
@@ -1,9 +1,3 @@
-[submodule "arduino/sketch/lib/LED_Bar"]
-	path = arduino/sketch/lib/LED_Bar
-	url = git@github.com:Seeed-Studio/Grove_LED_Bar.git
-[submodule "simulation/server/static/libs"]
-	path = simulation/server/static/libs
+[submodule "static/libs"]
+	path = static/libs
 	url = git@github.com:BP2013H1/BP2013H1-libs.git
-[submodule "website/static/libs"]
-	path = website/static/libs
-	url = git@github.com:BP2013H1/BP2013H1-libs.git
diff --git a/.travis.yml b/.travis.yml
@@ -2,6 +2,7 @@ branches:
   only:
     - master
     - dev
+    - dev-startup-changes
 notifications:
   email:
     - bp2013h1@lists.myhpi.de
@@ -12,8 +13,8 @@ env:
   - DJANGO_VERSION=1.6
 install: 
   - pip install -r requirements.txt --use-mirrors
+# before_script:
+#   - psql -U postgres -c 'create database bp2013h1;' -U postgres
 script:
-  - cd server
-  - python manage.py test
-  - cd ..
-  - nosetests simulation --with-coverage --cover-package=systems
+  - coverage run --source='.' manage.py test
+  - coverage report
diff --git a/README.md b/README.md
@@ -2,15 +2,3 @@ BP2013H1
 ========
 [![Build Status](https://magnum.travis-ci.com/BP2013H1/BP2013H1.png?token=7fqzGEv22MQpvpU7RhK5&branch=master)](https://magnum.travis-ci.com/BP2013H1/BP2013H1)
 
-
-## arduino
-This folder contains arduino related code for our plant project.
-
-## simulation
-This folder contains our simulation
-
-## server
-This folder contains our backend
-
-## website
-This folder contains our frontend
diff --git a/arduino/arduino_server.py b/arduino/arduino_server.py
diff --git a/arduino/sketch/compile_and_upload.sh b/arduino/sketch/compile_and_upload.sh
diff --git a/arduino/sketch/ino.ini b/arduino/sketch/ino.ini
diff --git a/arduino/sketch/lib/LED_Bar b/arduino/sketch/lib/LED_Bar
diff --git a/arduino/sketch/src/sketch.ino b/arduino/sketch/src/sketch.ino
diff --git a/cache/.gitignore b/cache/.gitignore
@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore
diff --git a/logs/.gitignore b/logs/.gitignore
@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore
diff --git a/server/manage.py → manage.py b/server/manage.py → manage.py
diff --git a/server/middleware/__init__.py → middleware/__init__.py b/server/middleware/__init__.py → middleware/__init__.py
diff --git a/server/middleware/cors.py → middleware/cors.py b/server/middleware/cors.py → middleware/cors.py
diff --git a/requirements.txt b/requirements.txt
@@ -1,11 +1,7 @@
 Django==1.6.2
-Flask==0.10.1
-Jinja2==2.7.2
-MarkupSafe==0.18
-Werkzeug==0.9.4
-itsdangerous==0.23
+psycopg2==2.5.2
 pytz==2012d
 simpy==3.0.2
 south==0.8.4
-nose==1.3.1
 coverage==3.7.1
+python-dateutil==1.5
diff --git a/server/__init__.py b/server/__init__.py
@@ -0,0 +1,7 @@
+import sys
+
+from server.helpers import start_demo_simulation
+
+# start demo simulation if neccessary
+if sys.argv[1] == 'runserver':
+    start_demo_simulation(print_visible=True)