worked API
This commit is contained in:
danamir
@@ -4,15 +4,13 @@ import json
|
||||
from bs4 import BeautifulSoup
|
||||
|
||||
|
||||
def getGroups(returnJson = 0):
|
||||
def getGroups(returnJson=0):
|
||||
headers = {'X-Requested-With': 'XMLHttpRequest',
|
||||
'User-Agent': 'Mozilla/5.0',
|
||||
'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'}
|
||||
|
||||
url = "http://tplan.madi.ru/tasks/task3,7_fastview.php"
|
||||
|
||||
|
||||
response = requests.get(url = url, headers=headers)
|
||||
response = requests.get(url=url, headers=headers)
|
||||
response.encoding = 'utf-8'
|
||||
|
||||
soup = BeautifulSoup(response.content, 'lxml')
|
||||
@@ -24,18 +22,16 @@ def getGroups(returnJson = 0):
|
||||
|
||||
if returnJson:
|
||||
return json.dumps(groups, ensure_ascii=False)
|
||||
return groups
|
||||
|
||||
return(groups)
|
||||
|
||||
def getGroupsList(returnJson = 0):
|
||||
def getGroupsList(returnJson=0):
|
||||
headers = {'X-Requested-With': 'XMLHttpRequest',
|
||||
'User-Agent': 'Mozilla/5.0',
|
||||
'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'}
|
||||
|
||||
url = "http://tplan.madi.ru/tasks/task3,7_fastview.php"
|
||||
|
||||
|
||||
response = requests.get(url = url, headers=headers)
|
||||
response = requests.get(url=url, headers=headers)
|
||||
response.encoding = 'utf-8'
|
||||
|
||||
soup = BeautifulSoup(response.content, 'lxml')
|
||||
@@ -48,18 +44,16 @@ def getGroupsList(returnJson = 0):
|
||||
if returnJson:
|
||||
return json.dumps(groups, ensure_ascii=False)
|
||||
|
||||
return(groups)
|
||||
return (groups)
|
||||
|
||||
|
||||
def getDepart(returnJson = 0):
|
||||
def getDepart(returnJson=0):
|
||||
headers = {'X-Requested-With': 'XMLHttpRequest',
|
||||
'User-Agent': 'Mozilla/5.0',
|
||||
'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'}
|
||||
|
||||
url = "http://tplan.madi.ru/tasks/task11_kafview.php"
|
||||
|
||||
|
||||
response = requests.get(url = url, headers=headers)
|
||||
response = requests.get(url=url, headers=headers)
|
||||
response.encoding = 'utf-8'
|
||||
|
||||
soup = BeautifulSoup(response.content, 'lxml')
|
||||
@@ -73,17 +67,16 @@ def getDepart(returnJson = 0):
|
||||
if returnJson:
|
||||
return json.dumps(departaments, ensure_ascii=False)
|
||||
|
||||
return(departaments)
|
||||
return (departaments)
|
||||
|
||||
def getTeach(returnJson = 0):
|
||||
def getTeach(returnJson=0):
|
||||
headers = {'X-Requested-With': 'XMLHttpRequest',
|
||||
'User-Agent': 'Mozilla/5.0',
|
||||
'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'}
|
||||
|
||||
url = "http://tplan.madi.ru/tasks/task8_prepview.php"
|
||||
|
||||
|
||||
response = requests.get(url = url, headers=headers)
|
||||
response = requests.get(url=url, headers=headers)
|
||||
response.encoding = 'utf-8'
|
||||
|
||||
soup = BeautifulSoup(response.content, 'lxml')
|
||||
@@ -97,32 +90,26 @@ def getTeach(returnJson = 0):
|
||||
if returnJson:
|
||||
return json.dumps(teaches, ensure_ascii=False)
|
||||
|
||||
return(teaches)
|
||||
|
||||
return (teaches)
|
||||
|
||||
def getFastPlan(gp_name, gp_id):
|
||||
headers = {'X-Requested-With': 'XMLHttpRequest',
|
||||
'User-Agent': 'Mozilla/5.0',
|
||||
'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'}
|
||||
|
||||
url = "http://tplan.madi.ru/tasks/tableFiller.php"
|
||||
url = "https://tplan.madi.ru/tasks/tableFiller.php"
|
||||
params = {
|
||||
'tab': '7',
|
||||
'gp_name': gp_name,
|
||||
'gp_id': gp_id}
|
||||
response = requests.post(url = url, data = params, headers=headers)
|
||||
response = requests.post(url=url, data=params, headers=headers)
|
||||
response.encoding = 'utf-8'
|
||||
|
||||
table_data = [[cell.text for cell in row()]
|
||||
for row in BeautifulSoup(response.text, 'lxml')("tr")]
|
||||
|
||||
dictOfWords = {i: table_data[i] for i in range(0, len(table_data))}
|
||||
|
||||
|
||||
dictOfWords = { i : table_data[i] for i in range(0, len(table_data) ) }
|
||||
|
||||
|
||||
return(json.dumps(dict(dictOfWords), ensure_ascii=False))
|
||||
|
||||
return (json.dumps(dict(dictOfWords), ensure_ascii=False))
|
||||
|
||||
def getExtPlan(gp_name, gp_id, sem_no, tp_year):
|
||||
headers = {'X-Requested-With': 'XMLHttpRequest',
|
||||
@@ -136,19 +123,15 @@ def getExtPlan(gp_name, gp_id, sem_no, tp_year):
|
||||
'gp_id': gp_id,
|
||||
'sem_no': sem_no,
|
||||
'tp_year': tp_year}
|
||||
response = requests.post(url = url, data = params, headers=headers)
|
||||
response = requests.post(url=url, data=params, headers=headers)
|
||||
response.encoding = 'utf-8'
|
||||
|
||||
table_data = [[cell.text for cell in row()]
|
||||
for row in BeautifulSoup(response.text, 'lxml')("tr")]
|
||||
|
||||
dictOfWords = {i: table_data[i] for i in range(0, len(table_data))}
|
||||
|
||||
|
||||
dictOfWords = { i : table_data[i] for i in range(0, len(table_data) ) }
|
||||
|
||||
|
||||
return(json.dumps(dict(dictOfWords), ensure_ascii=False))
|
||||
|
||||
return (json.dumps(dict(dictOfWords), ensure_ascii=False))
|
||||
|
||||
def getDeptPlan(dep_name, dep_id, sem_no, tp_year):
|
||||
headers = {'X-Requested-With': 'XMLHttpRequest',
|
||||
@@ -163,46 +146,48 @@ def getDeptPlan(dep_name, dep_id, sem_no, tp_year):
|
||||
'sort': 1,
|
||||
'sem_no': sem_no,
|
||||
'tp_year': tp_year}
|
||||
response = requests.post(url = url, data = params, headers=headers)
|
||||
response = requests.post(url=url, data=params, headers=headers)
|
||||
response.encoding = 'utf-8'
|
||||
|
||||
table_data = [[cell.text for cell in row()]
|
||||
for row in BeautifulSoup(response.text, 'lxml')("tr")]
|
||||
|
||||
dictOfWords = {i: table_data[i] for i in range(0, len(table_data))}
|
||||
|
||||
return (json.dumps(dict(dictOfWords), ensure_ascii=False))
|
||||
|
||||
dictOfWords = { i : table_data[i] for i in range(0, len(table_data) ) }
|
||||
|
||||
|
||||
return(json.dumps(dict(dictOfWords), ensure_ascii=False))
|
||||
|
||||
|
||||
def getTeachPlan(teach_name, teach_id, sem_no, tp_year):
|
||||
def getTeachPlan(tp_year, sem_no, teach_id, teach_name):
|
||||
headers = {'X-Requested-With': 'XMLHttpRequest',
|
||||
'User-Agent': 'Mozilla/5.0',
|
||||
'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'}
|
||||
|
||||
url = "http://tplan.madi.ru/tasks/tableFiller.php"
|
||||
url = "https://tplan.madi.ru/tasks/tableFiller.php"
|
||||
#tab=8&tp_year=20&sem_no=1&pr_id=2162&pr_name=%D0%90%D0%B1%D0%B1%D0%B0%D1%81%D0%BE%D0%B2+%D0%AD.%D0%9C.
|
||||
|
||||
params = {
|
||||
'tab': '8',
|
||||
'pr_name': teach_name,
|
||||
'pr_id': teach_id,
|
||||
'tp_year': tp_year,
|
||||
'sem_no': sem_no,
|
||||
'tp_year': tp_year}
|
||||
response = requests.post(url = url, data = params, headers=headers)
|
||||
'pr_id': teach_id,
|
||||
'pr_name': teach_name
|
||||
}
|
||||
response = requests.post(url=url, data=params, headers=headers)
|
||||
response.encoding = 'utf-8'
|
||||
|
||||
table_data = [[cell.text for cell in row()]
|
||||
for row in BeautifulSoup(response.text, 'lxml')("tr")]
|
||||
|
||||
dictOfWords = {i: table_data[i] for i in range(0, len(table_data))}
|
||||
|
||||
return (json.dumps(dict(dictOfWords), ensure_ascii=False))
|
||||
|
||||
dictOfWords = { i : table_data[i] for i in range(0, len(table_data) ) }
|
||||
|
||||
|
||||
return(json.dumps(dict(dictOfWords), ensure_ascii=False))
|
||||
def getGroupId(gp_name):
|
||||
allGp = getGroups()
|
||||
gp_id = allGp.get(gp_name)
|
||||
print(gp_id)
|
||||
return gp_id
|
||||
|
||||
if __name__ == '__main__':
|
||||
getGroups()
|
||||
|
||||
pr = getTeachPlan(tp_year='20', sem_no='1', teach_id='1711', teach_name='tets' )
|
||||
print(pr)
|
||||
|
||||
|
||||
@@ -73,7 +73,7 @@ def getTeacPlan():
|
||||
sem_no = request.args.get('sem_no', None)
|
||||
tp_year = request.args.get('tp_year', None)
|
||||
teach_id = teach[teach_name.lower()]
|
||||
return actions.getTeachPlan(teach_name, teach_id, sem_no, tp_year)
|
||||
return actions.getTeachPlan(tp_year, sem_no, teach_id, teach_name)
|
||||
|
||||
@app.route('/api/v1.0/table/teach_plan', methods=['GET'])
|
||||
def getTableTeacPlan():
|
||||
|
||||
1
app.py
1
app.py
@@ -31,7 +31,6 @@ def rasp_group():
|
||||
raspform = SelectGroupForm(request.form)
|
||||
grp = getGroup()
|
||||
for i in grp:
|
||||
print("i = ",i)
|
||||
raspform.group.choices.append(i)
|
||||
|
||||
raspform.day.choices = ['Понедельник','Вторник','Среда','Четверг','Пятница','Суббота']
|
||||
|
||||
@@ -16,7 +16,6 @@ def getCountTable(table):
|
||||
# print("A =================== ",int(a))
|
||||
return int((a)/6)
|
||||
|
||||
|
||||
def getCountTable1(table):
|
||||
# print("1111111111111",table)
|
||||
a = 0
|
||||
@@ -105,6 +104,8 @@ def getPrepRasp(NamePrep, DayOfWeek="Понедельник"):
|
||||
table[3 + 6 * int(j)] = (grn[str(a)][3])
|
||||
table[4 + 6 * int(j)] = (grn[str(a)][4])
|
||||
table[5 + 6 * int(j)] = (grn[str(a)][5])
|
||||
print(table)
|
||||
|
||||
except KeyError:
|
||||
print("KeyError")
|
||||
for i in range(48):
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
|
||||
<a href="#" class=""><img class="logo align-middle" src="{{url_for('static', filename='img/logo.png')}}"></a>
|
||||
|
||||
<a href="index.html" class="btn_back"> Назад </a>
|
||||
|
||||
|
||||
|
||||
<nav class="navbar navbar-expand-sm pb-3 navbar-light justify-content-center">
|
||||
@@ -102,7 +102,18 @@
|
||||
|
||||
|
||||
|
||||
<div class="container data text-center" id="fotdata">
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
</body>
|
||||
<footer class="page-footer justify-content-center mx-auto ">
|
||||
<div class="container data text-center" id="fotdata">
|
||||
<div class="row justify-content-around">
|
||||
|
||||
<div class="data col-3">
|
||||
@@ -118,58 +129,14 @@
|
||||
</div>
|
||||
|
||||
<div class="data col-3">
|
||||
<h5 class="justify-content-center " id="group__time">10:00</h5>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<h5 class="justify-content-center "><a href="index.html"> Назад </a></h5>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<!-- Modal -->
|
||||
<div class="modal fade" id="exampleModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel"
|
||||
aria-hidden="true">
|
||||
<div class="modal-dialog border-0" role="document">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
<h5 class="modal-title" id="exampleModalLabel"></h5>
|
||||
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
|
||||
<span aria-hidden="true">×</span>
|
||||
</button>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<div class="col modul-foto">
|
||||
<img src="images/Alex.jpg" class="border border-dark">
|
||||
</div>
|
||||
<div class="col text-center">
|
||||
Сальный Александр Геннадьевич, Старший преподаватель
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button type="button" class="btn btn-secondary " data-dismiss="modal">Close</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
</body>
|
||||
<footer class="page-footer justify-content-center mx-auto ">
|
||||
|
||||
</footer>
|
||||
<!-- Footer -->
|
||||
|
||||
</body>
|
||||
</div>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user