rzmk/learnhouse
1
0
Fork 0
mirror of https://github.com/rzmk/learnhouse.git synced 2025-12-19 04:19:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

generic fixes

Browse source
This commit is contained in:
swve 2023-11-20 19:53:56 +01:00
parent d95497e804
commit 2485285a06
9 changed files with 31 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

4
apps/api/src/services/blocks/block_types/imageBlock/imageBlock.py
View file

@ -50,11 +50,11 @@ async def create_image_block(
# create block
block = Block(
activity_id=activity.id is not None,
activity_id=activity.id if activity.id else 0,
block_type=BlockTypeEnum.BLOCK_IMAGE,
content=block_data.dict(),
org_id=org_id,
course_id=course.id is not None,
course_id=course.id if course.id else 0,
block_uuid=block_uuid,
creation_date=str(datetime.now()),
update_date=str(datetime.now()),

4
apps/api/src/services/blocks/block_types/pdfBlock/pdfBlock.py
View file

@ -51,11 +51,11 @@ async def create_pdf_block(
# create block
block = Block(
activity_id=activity.id is not None,
activity_id=activity.id if activity.id else 0,
block_type=BlockTypeEnum.BLOCK_DOCUMENT_PDF,
content=block_data.dict(),
org_id=org_id,
course_id=course.id is not None,
course_id=course.id if course.id else 0,
block_uuid=block_uuid,
creation_date=str(datetime.now()),
update_date=str(datetime.now()),

4
apps/api/src/services/blocks/block_types/videoBlock/videoBlock.py
View file

@ -51,11 +51,11 @@ async def create_video_block(
# create block
block = Block(
activity_id=activity.id is not None,
activity_id=activity.id if activity.id else 0,
block_type=BlockTypeEnum.BLOCK_VIDEO,
content=block_data.dict(),
org_id=org_id,
course_id=course.id is not None,
course_id=course.id if course.id else 0,
block_uuid=block_uuid,
creation_date=str(datetime.now()),
update_date=str(datetime.now()),

2
apps/api/src/services/courses/activities/pdf.py
View file

@ -80,7 +80,7 @@ async def create_documentpdf_activity(
},
published_version=1,
version=1,
org_id=org_id is not None,
org_id=org_id if org_id else 0,
course_id=coursechapter.course_id,
activity_uuid=activity_uuid,
creation_date=str(datetime.now()),

33
apps/api/src/services/dev/mocks/initial.py
View file

@ -5,7 +5,6 @@ from uuid import uuid4
from fastapi import Request
from src.services.users.schemas.users import UserInDB
from src.security.security import security_hash_password
from src.services.courses.chapters import CourseChapter, create_coursechapter
from src.services.courses.activities.activities import Activity, create_activity
from src.services.users.users import PublicUser
@ -196,19 +195,19 @@ async def create_initial_data(request: Request):
# await courses.insert_one(course.dict())
# create chapters
for i in range(0, 5):
coursechapter = CourseChapter(
name=fake_multilang.unique.sentence(),
description=fake_multilang.unique.text(),
activities=[],
)
coursechapter = await create_coursechapter(request,coursechapter, course_id, current_user)
if coursechapter:
# create activities
for i in range(0, 5):
activity = Activity(
name=fake_multilang.unique.sentence(),
type="dynamic",
content={},
)
activity = await create_activity(request,activity, "org_test", coursechapter['coursechapter_id'], current_user)
# for i in range(0, 5):
# coursechapter = CourseChapter(
# name=fake_multilang.unique.sentence(),
# description=fake_multilang.unique.text(),
# activities=[],
# )
# coursechapter = await create_coursechapter(request,coursechapter, course_id, current_user)
# if coursechapter:
# # create activities
# for i in range(0, 5):
# activity = Activity(
# name=fake_multilang.unique.sentence(),
# type="dynamic",
# content={},
# )
# activity = await create_activity(request,activity, "org_test", coursechapter['coursechapter_id'], current_user)

1
apps/api/src/services/install/install.py
View file

@ -6,7 +6,6 @@ import requests
from config.config import get_learnhouse_config
from src.security.security import security_hash_password
from src.services.courses.activities.activities import Activity, create_activity
from src.services.courses.chapters import create_coursechapter, CourseChapter
from src.services.orgs.schemas.orgs import Organization, OrganizationInDB
from faker import Faker

2
apps/api/src/services/orgs/orgs.py
View file

@ -83,7 +83,7 @@ async def create_org(
# Link user to org
user_org = UserOrganization(
user_id=int(current_user.id),
org_id=int(org.id is not None),
org_id=int(org.id if org.id else 0),
role_id=1,
creation_date=str(datetime.now()),
update_date=str(datetime.now()),

14
apps/api/src/services/trail/trail.py
View file

@ -10,8 +10,6 @@ from src.db.trail_runs import TrailRun, TrailRunCreate, TrailRunRead
from src.db.trail_steps import TrailStep
from src.db.trails import Trail, TrailCreate, TrailRead
from src.db.users import PublicUser
from src.services.orgs.schemas.orgs import PublicOrganization
from src.services.courses.chapters import get_coursechapters_meta
async def create_user_trail(
@ -164,8 +162,8 @@ async def add_activity_to_trail(
if not trailrun:
trailrun = TrailRun(
trail_id=trail.id is not None,
course_id=course.id is not None,
trail_id=trail.id if trail.id is not None else 0,
course_id=course.id if course.id is not None else 0 ,
org_id=course.org_id,
user_id=user.id,
creation_date=str(datetime.now()),
@ -182,9 +180,9 @@ async def add_activity_to_trail(
if not trailstep:
trailstep = TrailStep(
trailrun_id=trailrun.id is not None,
trailrun_id=trailrun.id if trailrun.id is not None else 0 ,
activity_id=activity_id,
course_id=course.id is not None,
course_id=course.id if course.id is not None else 0,
org_id=course.org_id,
complete=False,
teacher_verified=False,
@ -265,8 +263,8 @@ async def add_course_to_trail(
if not trail_run:
trail_run = TrailRun(
trail_id=trail.id is not None,
course_id=course.id is not None,
trail_id=trail.id if trail.id is not None else 0,
course_id=course.id if course.id is not None else 0,
org_id=course.org_id,
user_id=user.id,
creation_date=str(datetime.now()),

3
apps/api/src/services/users/users.py
View file

@ -75,7 +75,7 @@ async def create_user(
# Link user and organization
user_organization = UserOrganization(
user_id=user.id is not None,
user_id=user.id if user.id else 0,
org_id=int(org_id),
role_id=1,
creation_date=str(datetime.now()),
@ -201,7 +201,6 @@ async def update_user_password(
user.password = await security_hash_password(form.new_password)
user.update_date = str(datetime.now())
# Update user in database
db_session.add(user)
db_session.commit()