inex
/
flask-contacts
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: inex:students
Branches Tags
inex:master
inex:students
..
compare: inex:master
Branches Tags
inex:students
inex:master

No commits in common. "students" and "master" have entirely different histories.
students ... master

8 changed files with 192 additions and 127 deletions
Show Stats Expand all files Collapse all files

0
backend/__init__.py → contacts/__init__.py
View File

6
backend/app.py → contacts/app.py
View File

@ -3,7 +3,7 @@
import os
from . import db
from .students import Students, Student
from .contacts import Contacts, Contact
from flask import Flask, request, jsonify
from flask_restful import Api
@ -15,8 +15,8 @@ def create_app(test_config=None):
db.init_app(app)
api = Api(app)
CORS(app, resources={r"/api/*": {"origins": "*"}})
api.add_resource(Students, '/api/students')
api.add_resource(Student, '/api/students/<int:uid>')
api.add_resource(Contacts, '/api/contacts')
api.add_resource(Contact, '/api/contacts/<int:uid>')
return app

143
backend/students.py → contacts/contacts.py
View File

@ -8,28 +8,31 @@ from flask_restful import Resource, Api, reqparse
from .db import get_db
class Students(Resource):
class Contacts(Resource):
def get(self):
db = get_db()
cur = db.cursor()
cur.execute("SELECT uid, last_name_val, first_name_val, middle_name_val, discipline_val, mark"
cur.execute("SELECT uid, last_name_val, first_name_val, middle_name_val, street_val, build, build_k, apartment, telephone"
" FROM main"
" join last_name on main.last_name = last_name_id"
" join first_name on main.first_name = first_name_id"
" join middle_name on main.middle_name = middle_name_id"
" join discipline on main.discipline = discipline_id")
students = cur.fetchall()
" join street on main.street = street_id")
contacts = cur.fetchall()
def convert(data):
return {
'uid': data[0],
'last_name': data[1],
'first_name': data[2],
'middle_name': data[3],
'discipline': data[4],
'mark': data[5]
'street': data[4],
'build': data[5],
'build_k': data[6],
'apartment': data[7],
'telephone': data[8]
}
students = [convert(student) for student in students]
return students
contacts = [convert(contact) for contact in contacts]
return contacts
def post(self):
db = get_db()
@ -38,10 +41,13 @@ class Students(Resource):
parser.add_argument('last_name')
parser.add_argument('first_name')
parser.add_argument('middle_name')
parser.add_argument('discipline')
parser.add_argument('mark')
parser.add_argument('street')
parser.add_argument('build')
parser.add_argument('build_k')
parser.add_argument('apartment')
parser.add_argument('telephone', required=True)
args = parser.parse_args()
cur.execute("SELECT uid FROM main ORDER BY uid DESC LIMIT 1")
uid = cur.fetchone()
if uid is None:
@ -78,77 +84,83 @@ class Students(Resource):
middle_name = middle_name[0]
else:
middle_name = middle_name[0]
cur.execute("SELECT discipline_id FROM discipline WHERE discipline_val = %s", (args['discipline'],))
discipline = cur.fetchone()
if discipline is None:
cur.execute("INSERT INTO discipline (discipline_val) VALUES (%s)", (args['discipline'],))
cur.execute("SELECT discipline_id FROM discipline WHERE discipline_val = %s", (args['discipline'],))
discipline = cur.fetchone()
discipline = discipline[0]
cur.execute("SELECT street_id FROM street WHERE street_val = %s", (args['street'],))
street = cur.fetchone()
if street is None:
cur.execute("INSERT INTO street (street_val) VALUES (%s)", (args['street'],))
cur.execute("SELECT street_id FROM street WHERE street_val = %s", (args['street'],))
street = cur.fetchone()
street = street[0]
else:
discipline = discipline[0]
cur.execute("INSERT INTO main (uid, last_name, first_name, middle_name, discipline, mark)"
" VALUES (%s, %s, %s, %s, %s, %s)",
(uid, last_name, first_name, middle_name, discipline, args['mark']))
street = street[0]
cur.execute("INSERT INTO main (uid, last_name, first_name, middle_name, street, build, build_k, apartment, telephone)"
" VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s)",
(uid, last_name, first_name, middle_name, street, args['build'], args['build_k'], args['apartment'], args['telephone']))
db.commit()
return {'uid': uid}, 201
class Student(Resource):
class Contact(Resource):
def get(self, uid):
db = get_db()
cur = db.cursor()
cur.execute("SELECT uid, last_name_val, first_name_val, middle_name_val, discipline_val, mark"
cur.execute("SELECT uid, last_name_val, first_name_val, middle_name_val, street_val, build, build_k, apartment, telephone"
" FROM main"
" join last_name on main.last_name = last_name_id"
" join first_name on main.first_name = first_name_id"
" join middle_name on main.middle_name = middle_name_id"
" join discipline on main.discipline = discipline_id"
" join street on main.street = street_id"
" WHERE uid = %s", (uid,))
student = cur.fetchone()
if student is None:
return {'message': 'Student not found'}, 404
contact = cur.fetchone()
if contact is None:
return {'message': 'Contact not found'}, 404
def convert(data):
return {
'uid': data[0],
'last_name': data[1],
'first_name': data[2],
'middle_name': data[3],
'discipline': data[4],
'mark': data[5]
'street': data[4],
'build': data[5],
'build_k': data[6],
'apartment': data[7],
'telephone': data[8]
}
student = convert(student)
return student
contact = convert(contact)
return contact
def delete(self, uid):
db = get_db()
cur = db.cursor()
cur.execute("SELECT uid FROM main WHERE uid = %s", (uid,))
student = cur.fetchone()
if student is None:
return {'message': 'Student not found'}, 404
contact = cur.fetchone()
if contact is None:
return {'message': 'Contact not found'}, 404
cur.execute("DELETE FROM main WHERE uid = %s", (uid,))
db.commit()
return {'message': 'Student deleted'}
return {'message': 'Contact deleted'}
def put(self, uid):
parser = reqparse.RequestParser()
parser.add_argument('last_name')
parser.add_argument('first_name')
parser.add_argument('middle_name')
parser.add_argument('discipline')
parser.add_argument('mark')
parser.add_argument('street')
parser.add_argument('build')
parser.add_argument('build_k')
parser.add_argument('apartment')
parser.add_argument('telephone')
args = parser.parse_args()
db = get_db()
cur = db.cursor()
cur.execute("SELECT uid FROM main WHERE uid = %s", (uid,))
student = cur.fetchone()
if student is None:
return {'message': 'Student not found'}, 404
contact = cur.fetchone()
if contact is None:
return {'message': 'Contact not found'}, 404
if args['last_name'] is not None:
cur.execute("SELECT last_name_id FROM last_name WHERE last_name_val = %s", (args['last_name'],))
last_name = cur.fetchone()
@ -160,7 +172,7 @@ class Student(Resource):
else:
last_name = last_name[0]
cur.execute("UPDATE main SET last_name = %s WHERE uid = %s", (last_name, uid))
if args['first_name'] is not None:
cur.execute("SELECT first_name_id FROM first_name WHERE first_name_val = %s", (args['first_name'],))
first_name = cur.fetchone()
@ -172,7 +184,7 @@ class Student(Resource):
else:
first_name = first_name[0]
cur.execute("UPDATE main SET first_name = %s WHERE uid = %s", (first_name, uid))
if args['middle_name'] is not None:
cur.execute("SELECT middle_name_id FROM middle_name WHERE middle_name_val = %s", (args['middle_name'],))
middle_name = cur.fetchone()
@ -184,21 +196,30 @@ class Student(Resource):
else:
middle_name = middle_name[0]
cur.execute("UPDATE main SET middle_name = %s WHERE uid = %s", (middle_name, uid))
if args['discipline'] is not None:
cur.execute("SELECT discipline_id FROM discipline WHERE discipline_val = %s", (args['discipline'],))
discipline = cur.fetchone()
if discipline is None:
cur.execute("INSERT INTO discipline (discipline_val) VALUES (%s)", (args['discipline'],))
cur.execute("SELECT discipline_id FROM discipline WHERE discipline_val = %s", (args['discipline'],))
discipline = cur.fetchone()
discipline = discipline[0]
if args['street'] is not None:
cur.execute("SELECT street_id FROM street WHERE street_val = %s", (args['street'],))
street = cur.fetchone()
if street is None:
cur.execute("INSERT INTO street (street_val) VALUES (%s)", (args['street'],))
cur.execute("SELECT street_id FROM street WHERE street_val = %s", (args['street'],))
street = cur.fetchone()
street = street[0]
else:
discipline = discipline[0]
cur.execute("UPDATE main SET discipline = %s WHERE uid = %s", (discipline, uid))
if args['mark'] is not None:
cur.execute("UPDATE main SET mark = %s WHERE uid = %s", (args['mark'], uid))
street = street[0]
cur.execute("UPDATE main SET street = %s WHERE uid = %s", (street, uid))
if args['build'] is not None:
cur.execute("UPDATE main SET build = %s WHERE uid = %s", (args['build'], uid))
if args['build_k'] is not None:
cur.execute("UPDATE main SET build_k = %s WHERE uid = %s", (args['build_k'], uid))
if args['apartment'] is not None:
cur.execute("UPDATE main SET apartment = %s WHERE uid = %s", (args['apartment'], uid))
if args['telephone'] is not None:
cur.execute("UPDATE main SET telephone = %s WHERE uid = %s", (args['telephone'], uid))
db.commit()
return {'message': 'Student updated'}
return {'message': 'Contact updated'}

0
backend/db.py → contacts/db.py
View File

19
backend/schema.sql → contacts/schema.sql
View File

@ -2,7 +2,7 @@ DROP TABLE IF EXISTS main;
DROP TABLE IF EXISTS first_name;
DROP TABLE IF EXISTS last_name;
DROP TABLE IF EXISTS middle_name;
DROP TABLE IF EXISTS discipline;
DROP TABLE IF EXISTS street;
CREATE TABLE first_name (
first_name_id SERIAL PRIMARY KEY,
first_name_val VARCHAR(255) NOT NULL
@ -15,20 +15,23 @@ CREATE TABLE middle_name (
middle_name_id SERIAL PRIMARY KEY,
middle_name_val VARCHAR(255) NOT NULL
);
CREATE TABLE discipline (
discipline_id SERIAL PRIMARY KEY,
discipline_val VARCHAR(255) NOT NULL
CREATE TABLE street (
street_id SERIAL PRIMARY KEY,
street_val VARCHAR(255) NOT NULL
);
CREATE TABLE main (
uid serial,
last_name int,
first_name int,
middle_name int,
discipline int,
mark VARCHAR(255),
street int,
build VARCHAR(255),
build_k VARCHAR(255),
apartment VARCHAR(255),
telephone VARCHAR(255) NOT NULL,
CONSTRAINT fk_last_name FOREIGN KEY (last_name) REFERENCES last_name(last_name_id),
CONSTRAINT fk_first_name FOREIGN KEY (first_name) REFERENCES first_name(first_name_id),
CONSTRAINT fk_middle_name FOREIGN KEY (middle_name) REFERENCES middle_name(middle_name_id),
CONSTRAINT fk_discipline FOREIGN KEY (discipline) REFERENCES discipline(discipline_id),
CONSTRAINT fk_street FOREIGN KEY (street) REFERENCES street(street_id),
PRIMARY KEY (uid)
);
);

45
frontend/src/App.jsx
View File

@ -4,31 +4,38 @@ import { Container, Dialog, Typography, IconButton, Tooltip } from '@mui/materia
import MUIDataTable from "mui-datatables";
import { useAxios } from './axios';
import { useMutation, useQuery, useQueryClient } from 'react-query';
import StudentDialog from './StudentDialog';
import ContactDialog from './ContactDialog';
import AddIcon from '@mui/icons-material/Add';
function App() {
const client = useAxios();
const queryClient = useQueryClient()
const [open, setOpen] = React.useState(false);
const [openedStudent, setOpenedStudent] = React.useState({});
const { data, status } = useQuery('students', async () => {
const {data} = await client.get('/api/students');
return data.map(({
const [openedContact, setOpenedContact] = React.useState({});
const { data, status } = useQuery('contacts', async () => {
const {data} = await client.get('/api/contacts');
return data.map(({
uid,
first_name,
last_name,
middle_name,
discipline,
mark,
telephone,
street,
build,
build_k,
apartment
}) => {
return {
'first_name': first_name,
'last_name': last_name,
'middle_name': middle_name,
'discipline': discipline,
'mark': mark,
'telephone': telephone,
'street': street,
'build': build,
'build_k': build_k,
'apartment': apartment,
'display_name': `${first_name} ${last_name} ${middle_name}`,
'display_address': `${street} ${build} ${build_k} ${apartment}`,
'uid': uid
};
})
@ -43,23 +50,23 @@ function App() {
name: "display_name", label: "Имя"
},
{
name: "mark", label: "Оценка"
name: "telephone", label: "Телефон"
},
{
name: "discipline", label: "Дисциплина"
name: "display_address", label: "Адрес"
},
];
const commitDelete = useMutation(async (uid) => {
await client.delete(`/api/students/${uid}`);
await client.delete(`/api/contacts/${uid}`);
}, {
onSuccess: () => {
queryClient.invalidateQueries('students');
queryClient.invalidateQueries('contacts');
}
});
const handleRowClick = (rowData) => {
setOpenedStudent(data.find(({uid}) => uid === rowData[0]));
setOpenedContact(data.find(({uid}) => uid === rowData[0]));
setOpen(true);
console.log(data.find(({uid}) => uid === rowData[0]));
};
@ -81,7 +88,7 @@ function App() {
return (
<Container maxWidth="md">
<MUIDataTable
title={"Зачётная книжка"}
title={"Контактная книга"}
data={data}
columns={columns}
options={{
@ -96,19 +103,19 @@ function App() {
onRowsDelete: handleRowsDelete
}}
/>
<StudentDialog
<ContactDialog
open={open}
onClose={handleClose}
student={openedStudent}
contact={openedContact}
/>
</Container>
);
function CustomToolbar() {
if (data !== undefined) return (
<Tooltip title='Новая запись'>
<Tooltip title='Новый контакт'>
<IconButton onClick={() => {
setOpenedStudent({});
setOpenedContact({});
setOpen(true);
}}>
<AddIcon />

104
frontend/src/StudentDialog.jsx → frontend/src/ContactDialog.jsx
View File

@ -6,32 +6,35 @@ import { useAxios } from './axios';
import { useMutation, useQuery, useQueryClient } from 'react-query';
function StudentDialog({
function ContactDialog({
open,
onClose,
student,
contact,
}) {
const client = useAxios();
const queryClient = useQueryClient()
const [uid, setUid] = React.useState(student ? student.uid : null);
const [firstName, setFirstName] = React.useState(student['first_name'] ?? '');
const [lastName, setLastName] = React.useState(student['last_name'] ?? '');
const [middleName, setMiddleName] = React.useState(student['middle_name'] ?? '');
const [discipline, setDiscipline] = React.useState(student['discipline'] ?? '');
const [mark, setMark] = React.useState(student['mark'] ?? '');
const [uid, setUid] = React.useState(contact ? contact.uid : null);
const [firstName, setFirstName] = React.useState(contact['first_name'] ?? '');
const [lastName, setLastName] = React.useState(contact['last_name'] ?? '');
const [middleName, setMiddleName] = React.useState(contact['middle_name'] ?? '');
const [telephone, setTelephone] = React.useState(contact['telephone'] ?? '');
const [street, setStreet] = React.useState(contact['street'] ?? '');
const [build, setBuild] = React.useState(contact['build'] ?? '');
const [buildK, setBuildK] = React.useState(contact['build_k'] ?? '');
const [apartment, setApartment] = React.useState(contact['apartment'] ?? '');
const commitCreate = useMutation(async (payload) => client.post('/api/students', payload), {
const commitCreate = useMutation(async (payload) => client.post('/api/contacts', payload), {
onSuccess: () => {
queryClient.invalidateQueries('students');
queryClient.invalidateQueries('contacts');
onClose();
}
});
const commitUpdate = useMutation(async (payload) => client.put(`/api/students/${student['uid']}`, payload), {
const commitUpdate = useMutation(async (payload) => client.put(`/api/contacts/${contact['uid']}`, payload), {
onSuccess: () => {
queryClient.invalidateQueries('students');
queryClient.invalidateQueries(['student', student['uid']]);
queryClient.invalidateQueries('contacts');
queryClient.invalidateQueries(['contact', contact['uid']]);
onClose();
}
});
@ -42,10 +45,13 @@ function StudentDialog({
first_name: firstName,
last_name: lastName,
middle_name: middleName,
discipline: discipline,
mark: mark,
telephone: telephone,
street: street,
build: build,
build_k: buildK,
apartment: apartment
};
if (student['uid']) {
if (contact['uid']) {
commitUpdate.mutate(data);
}
else {
@ -55,13 +61,16 @@ function StudentDialog({
};
const loadData = () => {
console.log(student);
setUid(student['uid'] ?? null);
setFirstName(student['first_name'] ?? '');
setLastName(student['last_name'] ?? '');
setMiddleName(student['middle_name'] ?? '');
setDiscipline(student['discipline'] ?? '');
setMark(student['mark'] ?? '');
console.log(contact);
setUid(contact['uid'] ?? null);
setFirstName(contact['first_name'] ?? '');
setLastName(contact['last_name'] ?? '');
setMiddleName(contact['middle_name'] ?? '');
setTelephone(contact['telephone'] ?? '');
setStreet(contact['street'] ?? '');
setBuild(contact['build'] ?? '');
setBuildK(contact['build_k'] ?? '');
setApartment(contact['apartment'] ?? '');
};
return (
@ -74,7 +83,7 @@ function StudentDialog({
onEnter: loadData
}}
>
<DialogTitle>Студент</DialogTitle>
<DialogTitle>Контакт</DialogTitle>
<form onSubmit={handleFormSubmit}>
<DialogContent dividers>
<Grid container spacing={3}>
@ -107,20 +116,47 @@ function StudentDialog({
</Grid>
<Grid item xs={12}>
<TextField
id="discipline"
label="Дисциплина"
value={discipline}
onChange={(event) => setDiscipline(event.target.value)}
id="telephone"
label="Телефон"
value={telephone}
onChange={(event) => setTelephone(event.target.value)}
fullWidth
required
/>
</Grid>
<Grid item xs={12}>
<Grid item xs={6}>
<TextField
id="mark"
label="Оценка"
value={mark}
onChange={(event) => setMark(event.target.value)}
id="street"
label="Улица"
value={street}
onChange={(event) => setStreet(event.target.value)}
fullWidth
/>
</Grid>
<Grid item xs={2}>
<TextField
id="build"
label="Дом"
value={build}
onChange={(event) => setBuild(event.target.value)}
fullWidth
/>
</Grid>
<Grid item xs={2}>
<TextField
id="build_k"
label="Корпус"
value={buildK}
onChange={(event) => setBuildK(event.target.value)}
fullWidth
/>
</Grid>
<Grid item xs={2}>
<TextField
id="apartment"
label="Квартира"
value={apartment}
onChange={(event) => setApartment(event.target.value)}
fullWidth
/>
</Grid>
@ -136,4 +172,4 @@ function StudentDialog({
</Dialog>
);
}
export default StudentDialog;
export default ContactDialog;

2
requirements.txt
View File

@ -1,7 +1,5 @@
flask
flask_restful
flask_socketio
flask_cors
pytz
click
psycopg2