samingdeveloper · choyai · Jul 22, 2018
diff --git a/Assign_Management/__pycache__/__init__.cpython-37.pyc b/Assign_Management/__pycache__/__init__.cpython-37.pyc
diff --git a/Assign_Management/__pycache__/admin.cpython-37.pyc b/Assign_Management/__pycache__/admin.cpython-37.pyc
diff --git a/Assign_Management/__pycache__/apps.cpython-37.pyc b/Assign_Management/__pycache__/apps.cpython-37.pyc
diff --git a/Assign_Management/__pycache__/models.cpython-37.pyc b/Assign_Management/__pycache__/models.cpython-37.pyc
diff --git a/Assign_Management/__pycache__/storage.cpython-37.pyc b/Assign_Management/__pycache__/storage.cpython-37.pyc
diff --git a/Assign_Management/__pycache__/urls.cpython-37.pyc b/Assign_Management/__pycache__/urls.cpython-37.pyc
diff --git a/Assign_Management/__pycache__/views.cpython-37.pyc b/Assign_Management/__pycache__/views.cpython-37.pyc
diff --git a/Assign_Management/migrations/__pycache__/0001_initial.cpython-37.pyc b/Assign_Management/migrations/__pycache__/0001_initial.cpython-37.pyc
diff --git a/Assign_Management/migrations/__pycache__/0002_auto_20180717_1656.cpython-37.pyc b/Assign_Management/migrations/__pycache__/0002_auto_20180717_1656.cpython-37.pyc
diff --git a/Assign_Management/migrations/__pycache__/0003_upload_user.cpython-37.pyc b/Assign_Management/migrations/__pycache__/0003_upload_user.cpython-37.pyc
diff --git a/Assign_Management/migrations/__pycache__/__init__.cpython-37.pyc b/Assign_Management/migrations/__pycache__/__init__.cpython-37.pyc
diff --git a/Class_Management/Template/EditClassroom.html b/Class_Management/Template/EditClassroom.html
@@ -51,11 +51,8 @@ <h3>Edit Classroom</h3>
                         <option value='{{ i.pk }}'> {{ i.get_full_name }}</option>
                         {% endfor %}
                     </select>
-<<<<<<< HEAD
                 <input type="submit" value="Update">
-=======
                 <input type="submit" value="Save">
->>>>>>> b12993777cc60f0e693458acf21e87aec969b9e1
             </form>
         </div>
     </div>

diff --git a/Class_Management/__pycache__/__init__.cpython-37.pyc b/Class_Management/__pycache__/__init__.cpython-37.pyc
diff --git a/Class_Management/__pycache__/admin.cpython-37.pyc b/Class_Management/__pycache__/admin.cpython-37.pyc
diff --git a/Class_Management/__pycache__/apps.cpython-37.pyc b/Class_Management/__pycache__/apps.cpython-37.pyc
diff --git a/Class_Management/__pycache__/models.cpython-37.pyc b/Class_Management/__pycache__/models.cpython-37.pyc
diff --git a/Class_Management/__pycache__/urls.cpython-37.pyc b/Class_Management/__pycache__/urls.cpython-37.pyc
diff --git a/Class_Management/__pycache__/views.cpython-37.pyc b/Class_Management/__pycache__/views.cpython-37.pyc
diff --git a/Class_Management/migrations/__pycache__/0001_initial.cpython-37.pyc b/Class_Management/migrations/__pycache__/0001_initial.cpython-37.pyc
diff --git a/Class_Management/migrations/__pycache__/0002_auto_20180717_1656.cpython-37.pyc b/Class_Management/migrations/__pycache__/0002_auto_20180717_1656.cpython-37.pyc
diff --git a/Class_Management/migrations/__pycache__/__init__.cpython-37.pyc b/Class_Management/migrations/__pycache__/__init__.cpython-37.pyc
diff --git a/Class_Management/templatetags/__pycache__/__init__.cpython-37.pyc b/Class_Management/templatetags/__pycache__/__init__.cpython-37.pyc
diff --git a/Class_Management/templatetags/__pycache__/group_tags.cpython-37.pyc b/Class_Management/templatetags/__pycache__/group_tags.cpython-37.pyc
diff --git a/Class_Management/templatetags/__pycache__/prgress_tags.cpython-37.pyc b/Class_Management/templatetags/__pycache__/prgress_tags.cpython-37.pyc
diff --git a/Class_Management/templatetags/__pycache__/score_tags.cpython-37.pyc b/Class_Management/templatetags/__pycache__/score_tags.cpython-37.pyc
diff --git a/LogIn_Management/__pycache__/__init__.cpython-37.pyc b/LogIn_Management/__pycache__/__init__.cpython-37.pyc
diff --git a/LogIn_Management/__pycache__/admin.cpython-37.pyc b/LogIn_Management/__pycache__/admin.cpython-37.pyc
diff --git a/LogIn_Management/__pycache__/apps.cpython-37.pyc b/LogIn_Management/__pycache__/apps.cpython-37.pyc
diff --git a/LogIn_Management/__pycache__/forms.cpython-37.pyc b/LogIn_Management/__pycache__/forms.cpython-37.pyc
diff --git a/LogIn_Management/__pycache__/models.cpython-37.pyc b/LogIn_Management/__pycache__/models.cpython-37.pyc
diff --git a/LogIn_Management/__pycache__/views.cpython-37.pyc b/LogIn_Management/__pycache__/views.cpython-37.pyc
diff --git a/LogIn_Management/migrations/__pycache__/0001_initial.cpython-37.pyc b/LogIn_Management/migrations/__pycache__/0001_initial.cpython-37.pyc
diff --git a/LogIn_Management/migrations/__pycache__/__init__.cpython-37.pyc b/LogIn_Management/migrations/__pycache__/__init__.cpython-37.pyc
diff --git a/SamingDev/__pycache__/__init__.cpython-37.pyc b/SamingDev/__pycache__/__init__.cpython-37.pyc
diff --git a/SamingDev/__pycache__/settings.cpython-37.pyc b/SamingDev/__pycache__/settings.cpython-37.pyc
diff --git a/SamingDev/__pycache__/urls.cpython-37.pyc b/SamingDev/__pycache__/urls.cpython-37.pyc
diff --git a/SamingDev/__pycache__/wsgi.cpython-37.pyc b/SamingDev/__pycache__/wsgi.cpython-37.pyc
diff --git a/SamingDev/settings.py b/SamingDev/settings.py
@@ -23,7 +23,7 @@
 SECRET_KEY = '$(dz!yau&t9ct!opo59%5m4(egv(vz&avl4=pu!qq+&$-o-jjm'
 
 # SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = False
+DEBUG = True
 
 ALLOWED_HOSTS = ['localhost', '127.0.0.1', 'web']
 
@@ -88,18 +88,18 @@
 # https://docs.djangoproject.com/en/1.11/ref/settings/#databases
 
 DATABASES = {
+              #  'default': {
+               #     'ENGINE': 'django.db.backends.postgresql',
+                #    'NAME': 'postgres',
+                #   'USER': 'postgres',
+                 #   'PASSWORD': 'pengza78',
+                  #  'HOST': 'db',
+                  #  'PORT': 5432
+                #}
                 'default': {
-                    'ENGINE': 'django.db.backends.postgresql',
-                    'NAME': 'postgres',
-                   'USER': 'postgres',
-                    'PASSWORD': 'pengza78',
-                    'HOST': 'db',
-                    'PORT': 5432
+                    'ENGINE': 'django.db.backends.sqlite3',
+                    'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
                 }
-                #'default': {
-                #    'ENGINE': 'django.db.backends.sqlite3',
-                #    'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
-                #}
 }
 
 

diff --git a/db.sqlite3 b/db.sqlite3
diff --git a/requirements.txt b/requirements.txt
@@ -9,5 +9,5 @@ timeout-decorator
 #docker
 #redis
 #autograder-sandbox
-psycopg2-binary
+psycopg2
 mosspy