Skip to content

Commit 439aad5

Browse files
authored
Merge pull request #10 from codersforcauses/janelle-homepage
Janelle homepage
2 parents 4c29f60 + c022f14 commit 439aad5

20 files changed

Lines changed: 241 additions & 2 deletions

File tree

server/djangomaps/bin/python

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
python3

server/djangomaps/bin/python3

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/usr/bin/python3

server/djangomaps/bin/python3.12

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
python3

server/djangomaps/lib64

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
lib

server/djangomaps/pyvenv.cfg

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
home = /usr/bin
2+
include-system-site-packages = false
3+
version = 3.12.3
4+
executable = /usr/bin/python3.12
5+
command = /usr/bin/python3 -m venv /home/iroha/intermediate_team_1/server/djangomaps

server/home_page/__init__.py

Whitespace-only changes.

server/home_page/admin.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
from django.contrib import admin
2+
3+
# Register your models here.

server/home_page/apps.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
from django.apps import AppConfig
2+
3+
4+
class HomePageConfig(AppConfig):
5+
default_auto_field = 'django.db.models.BigAutoField'
6+
name = 'home_page'

server/home_page/migrations/__init__.py

Whitespace-only changes.

server/home_page/models.py

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
from django.db import models
2+
3+
from pet.models import Pet
4+
from tasks.models import Task
5+
from registration.models import Household, Business, PetCarer
6+
from vet.models import VetClinic
7+
8+
# Create your models here.
9+
10+
# NOTE: new address class to simplify code [SUGGESTION]
11+
# class Address(models.Model):
12+
# streetName = models.CharField(max_length=200)
13+
# suburb = models.CharField(max_length=100)
14+
# postcode = models.CharField(max_length=10)
15+
# state = models.CharField(max_length=5)
16+
# country = models.CharField(max_length=30)
17+
#
18+
# class Household(models.Model):
19+
# # [insert petcarer id here, from Kerry]
20+
# houseName = models.CharField(max_length=20)
21+
# houseNo = models.PositiveIntegerField() # houseNo is the same thing as streetNo in the DB diagram
22+
# address = models.ForeignKey(Address, on_delete=models.CASCADE)
23+
# def __str__(self):
24+
# return self.address
25+
#
26+
# class Business(models.Model):
27+
# businessID = models.CharField(max_length=10)
28+
# # [insert petcarer id here, from Kerry]
29+
# businessName = models.CharField(max_length=20)
30+
# buildingNo = models.PositiveIntegerField() # buildingNo is the same thing as streetNo in the DB diagram
31+
# def __str__(self):
32+
# return self.address
33+
34+
35+
# NOTE: selectable pets [SUGGESTION]
36+
# class Pet(models.Model):
37+
# CAT = 'cat'
38+
# DOG = 'dog'
39+
# BIRD = 'bir'
40+
# FISH = 'fis'
41+
# ANIMAL_TYPES = {
42+
# CAT: "Cat",
43+
# DOG: "Dog",
44+
# BIRD: "Bird",
45+
# FISH: "Fish",
46+
# }
47+
# animalType = models.CharField(
48+
# max_length=3,
49+
# choices=ANIMAL_TYPES,
50+
# default=CAT,
51+
# )
52+
#
53+
# petID = models.CharField(max_length=10)
54+
# petName = models.CharField(max_length=20)
55+
# birthDate = models.DateField()
56+
# petBreed = models.CharField(max_length=15)
57+
# weight = models.PositiveIntegerField()
58+
# # not sure what exerciseReq means
59+
# # [insert Household foreign key here]
60+
# # [insert Business foreign key here]
61+
# def __str__(self):
62+
# return self.petID
63+
64+
65+
# NOTE: crosscheck with Annabelle's tasks class
66+
# class PetTasks(models.Model): # the same thing as Tasks in the DB diagram
67+
# petID = models.ForeignKey(Pet, on_delete=models.CASCADE)
68+
# title = models.CharField(max_length=100)
69+
# description = models.CharField(max_length=1000)
70+
# due = models.DateTimeField()
71+
# isComplete = models.BooleanField(default=False)
72+
# def __str__(self):
73+
# return self.title
74+
75+
76+
class SymptomInstance(models.Model):
77+
petID = models.ForeignKey(Pet, on_delete=models.CASCADE)
78+
symptomType = models.CharField(max_length=100)
79+
extraInfo = models.CharField(max_length=1000)
80+
dateAndTime = models.DateTimeField()
81+
def __str__(self):
82+
return self.symptomType
83+
84+
class VetAppointment(models.Model):
85+
petID = models.ForeignKey(Pet, on_delete=models.CASCADE)
86+
dateAndTime = models.DateTimeField()
87+
vetClinic - models.ForeignKey(VetClinic, on_delete=models.CASCADE)
88+
def __str__(self):
89+
return f"{self.petID} - {self.dateAndTime}"

0 commit comments

Comments
 (0)