{% if LANGUAGE_CODE == 'ar' %}الملف الشخصي{% else %}Profile{% endif %}
+ {% if LANGUAGE_CODE == 'ar' %}الواجبات{% else %}Tasks{% endif %}
+
+ {% if LANGUAGE_CODE == 'ar' %}البريد الوارد{% else %}Inbox{% endif %}
+ {% if LANGUAGE_CODE == 'ar' %}لوحة تحكم المسؤول{% else %}Dashboard{% endif %} {% if LANGUAGE_CODE == 'ar' %}لوحة تحكم المسؤول{% else %}Dashboard{% endif %} {% if LANGUAGE_CODE == 'ar' %}تسجيل الخروج{% else %}Logout{% endif %}
+
+
+
+
تعديل الملف الشخصي
+
+
+
+
+
+
+
+
+
البريد الوارد 📥
+
الرسائل الواردة من المعلمين أو الطلاب.
+
+
+
+
+
+
+ {% if messages %}
+
+ {% else %}
+
+
📭
+
صندوق الوارد فارغ.
+
لم تستلم أي رسائل جديدة بعد.
+
+ {% endif %}
+
+
+
+
+
+
+
+
+
+
+
{{ message.subject }}
+
+ من:
+ {{ message.sender.get_full_name|default:message.sender.username }}
+
+
+ إلى:
+ {{ message.recipient.get_full_name|default:message.recipient.username }}
+
+
+
+
{{ message.created_at|date:"Y-m-d" }}
+
{{ message.created_at|date:"H:i A" }}
+
+
+
+
{{ message.body }}
+
+
+
+
+
+
+
+
+
البريد الصادر 📤
+
الرسائل التي قمت بإرسالها.
+
+
+
+
+
+
+ {% if messages %}
+
+
+ {% for message in messages %}
+
+
+
+ إلى:
+ {{ message.recipient.get_full_name|default:message.recipient.username }}
+
+ {{ message.created_at|date:"Y-m-d H:i" }}
+
+
{{ message.subject }}
+
{{ message.body|truncatechars:100 }}
+
+
+
+ {% endfor %}
+
+
+ {% else %}
+
+
📨
+
صندوق الصادر فارغ.
+
لم تقم بإرسال أي رسائل بعد.
+
+ {% endif %}
+
+
+
+
+
+
+
إرسال رسالة جديدة ✉️
+
+
+
+
+
+
موادي
diff --git a/core/templates/core/tasks/create_task.html b/core/templates/core/tasks/create_task.html
new file mode 100644
index 0000000..0331a6a
--- /dev/null
+++ b/core/templates/core/tasks/create_task.html
@@ -0,0 +1,38 @@
+{% extends 'base.html' %}
+{% load i18n static %}
+
+{% block title %}إضافة واجب جديد - EduPlatform{% endblock %}
+
+{% block content %}
+
+
+
+
+
إضافة واجب جديد 📝
+
+
+
+
+
+
+{% endblock %}
\ No newline at end of file
diff --git a/core/templates/core/tasks/task_detail.html b/core/templates/core/tasks/task_detail.html
new file mode 100644
index 0000000..d886c5d
--- /dev/null
+++ b/core/templates/core/tasks/task_detail.html
@@ -0,0 +1,63 @@
+{% extends 'base.html' %}
+{% load i18n static %}
+
+{% block title %}{{ task.title }} - EduPlatform{% endblock %}
+
+{% block content %}
+
+
+
+
+
+
+
+
+
{{ task.subject.name_ar }}
+
{{ task.title }}
+
بواسطة: {{ task.teacher.user.get_full_name }}
+
+ {% if task.due_date %}
+
+
موعد التسليم
+
{{ task.due_date|date:"d M" }}
+
{{ task.due_date|date:"H:i" }}
+
+ {% endif %}
+
+
+
+
+
+
التفاصيل
+
{{ task.description }}
+
+
+ {% if task.file %}
+
+ {% endif %}
+
+
+
+
+{% endblock %}
\ No newline at end of file
diff --git a/core/templates/core/tasks/task_list.html b/core/templates/core/tasks/task_list.html
new file mode 100644
index 0000000..6818f56
--- /dev/null
+++ b/core/templates/core/tasks/task_list.html
@@ -0,0 +1,99 @@
+{% extends 'base.html' %}
+{% load i18n static %}
+
+{% block title %}الواجبات والمهام - EduPlatform{% endblock %}
+
+{% block content %}
+
+
+
+
الواجبات والمهام 📝
+
+ {% if is_teacher %}
+ أدر واجبات طلابك ومتابعة تسليماتهم.
+ {% else %}
+ تابع واجباتك وقم بتسليمها في الوقت المحدد.
+ {% endif %}
+
+
+
+ {% if is_teacher %}
+
+
+
+ إضافة واجب جديد
+
+ {% endif %}
+
+
+
+
+
+ {% if tasks %}
+
+
+
+
+
+ العنوان
+ المادة
+ تاريخ التسليم
+ الحالة
+ الإجراءات
+
+
+
+ {% for task in tasks %}
+
+
+
+
+
+
{{ task.title }}
+ {{ task.created_at|date:"Y-m-d" }}
+
+
+
+ {{ task.subject.name_ar }}
+
+
+ {% if task.due_date %}
+ {{ task.due_date|date:"Y-m-d H:i" }}
+ {% else %}
+ غير محدد
+ {% endif %}
+
+
+ جديد
+
+
+ عرض التفاصيل
+
+
+ {% endfor %}
+
+
+
+
+ {% else %}
+
+
📋
+
لا توجد واجبات حالياً.
+ {% if is_teacher %}
+
ابدأ بإضافة واجبات لطلابك.
+ {% else %}
+
رائع! لقد أنجزت جميع مهامك.
+ {% endif %}
+
+ {% endif %}
+
+
+
+{% endblock %}
\ No newline at end of file
diff --git a/core/templates/core/teacher_dashboard.html b/core/templates/core/teacher_dashboard.html
index 32787fd..3fa1877 100644
--- a/core/templates/core/teacher_dashboard.html
+++ b/core/templates/core/teacher_dashboard.html
@@ -86,6 +86,42 @@
+
+
+
صفوفي
diff --git a/core/urls.py b/core/urls.py
index dcf9f71..3943f16 100644
--- a/core/urls.py
+++ b/core/urls.py
@@ -4,7 +4,7 @@ from . import views
urlpatterns = [
path('', views.index, name='index'),
- path('set-language//', views.set_language, name='set_language'),
+ path('switch-language/', views.switch_language, name='switch_language'),
path('subject//', views.subject_detail, name='subject_detail'),
path('ajax/get-subjects-by-level/', views.get_subjects_by_level, name='get_subjects_by_level'),
path('ajax/get-cities-by-governorate/', views.get_cities_by_governorate, name='get_cities_by_governorate'),
@@ -14,6 +14,7 @@ urlpatterns = [
path('ajax/get-classroom-subjects/', views.get_classroom_subjects, name='get_classroom_subjects'),
path('profile/', views.profile, name='profile'),
path('profile/edit/teacher/', views.edit_teacher_profile, name='edit_teacher_profile'),
+ path('profile/edit/student/', views.edit_student_profile, name='edit_student_profile'),
path('logout/', views.custom_logout, name='logout'),
path('subscribe//', views.subscribe_subject, name='subscribe_subject'),
path('package//subscribe/', views.subscribe_package, name='subscribe_package'),
@@ -24,4 +25,15 @@ urlpatterns = [
path('resource//edit/', views.edit_resource, name='edit_resource'),
path('resource//delete/', views.delete_resource, name='delete_resource'),
path('resource//view/', views.view_resource, name='view_resource'),
-]
+
+ # Tasks
+ path('tasks/', views.task_list, name='task_list'),
+ path('tasks/create/', views.create_task, name='create_task'),
+ path('tasks//', views.task_detail, name='task_detail'),
+
+ # Messages
+ path('messages/inbox/', views.inbox, name='inbox'),
+ path('messages/outbox/', views.outbox, name='outbox'),
+ path('messages/send/', views.send_message, name='send_message'),
+ path('messages//', views.message_detail, name='message_detail'),
+]
\ No newline at end of file
diff --git a/core/views.py b/core/views.py
index 1b11388..aaff8f2 100644
--- a/core/views.py
+++ b/core/views.py
@@ -2,14 +2,16 @@ from django.core.exceptions import PermissionDenied
from django.shortcuts import render, redirect, get_object_or_404
from django.utils import translation
from django.conf import settings
-from django.http import JsonResponse, FileResponse, Http404
+from django.http import JsonResponse, FileResponse, Http404, HttpResponseRedirect
from django.contrib.admin.views.decorators import staff_member_required
from django.contrib.auth.decorators import login_required
from django.contrib.auth import logout, login
-from django.urls import reverse
+from django.urls import reverse, translate_url
from django.db.models import Q
-from .models import Classroom, Subject, Teacher, Student, City, Resource, Package
-from .forms import StudentRegistrationForm, TeacherProfileForm, ResourceForm
+from django.contrib.auth.models import User
+from urllib.parse import urlparse
+from .models import Classroom, Subject, Teacher, Student, City, Resource, Package, Task, Message
+from .forms import StudentRegistrationForm, TeacherProfileForm, ResourceForm, StudentProfileForm, TaskForm, MessageForm
from .wablas import send_whatsapp_message
from .thawani import ThawaniClient
import random
@@ -23,16 +25,6 @@ def index(request):
context = {'levels': levels, 'teachers': teachers}
return render(request, 'core/index.html', context)
-def set_language(request, lang_code):
- next_url = request.GET.get('next', '/')
- response = redirect(next_url)
- if lang_code in [lang[0] for lang in settings.LANGUAGES]:
- translation.activate(lang_code)
- if hasattr(request, 'session'):
- request.session['_language'] = lang_code
- response.set_cookie(settings.LANGUAGE_COOKIE_NAME, lang_code)
- return response
-
def subject_detail(request, pk):
subject = get_object_or_404(Subject, pk=pk)
is_teacher = False
@@ -214,6 +206,23 @@ def edit_teacher_profile(request):
return render(request, 'core/edit_teacher_profile.html', {'form': form})
+@login_required
+def edit_student_profile(request):
+ try:
+ student = request.user.student_profile
+ except Student.DoesNotExist:
+ return redirect('profile')
+
+ if request.method == 'POST':
+ form = StudentProfileForm(request.POST, request.FILES, instance=student)
+ if form.is_valid():
+ form.save()
+ return redirect('profile')
+ else:
+ form = StudentProfileForm(instance=student)
+
+ return render(request, 'core/edit_student_profile.html', {'form': form})
+
def custom_logout(request):
logout(request)
return redirect('index')
@@ -446,4 +455,166 @@ def view_resource(request, resource_id):
elif resource.resource_type in ['LINK', 'VIDEO']:
return redirect(resource.link)
- return redirect('subject_detail', pk=resource.subject.id)
\ No newline at end of file
+ return redirect('subject_detail', pk=resource.subject.id)
+
+# --- Tasks Views ---
+
+@login_required
+def task_list(request):
+ user = request.user
+
+ if hasattr(user, 'teacher_profile'):
+ tasks = Task.objects.filter(teacher=user.teacher_profile)
+ is_teacher = True
+ elif hasattr(user, 'student_profile'):
+ tasks = Task.objects.filter(subject__in=user.student_profile.subscribed_subjects.all())
+ is_teacher = False
+ else:
+ tasks = Task.objects.none()
+ is_teacher = False
+
+ return render(request, 'core/tasks/task_list.html', {'tasks': tasks, 'is_teacher': is_teacher})
+
+@login_required
+def create_task(request):
+ try:
+ teacher = request.user.teacher_profile
+ except Teacher.DoesNotExist:
+ raise PermissionDenied("يجب أن تكون معلماً لإضافة واجب.")
+
+ if request.method == 'POST':
+ form = TaskForm(request.POST, request.FILES, teacher=teacher)
+ if form.is_valid():
+ task = form.save(commit=False)
+ task.teacher = teacher
+ task.save()
+ return redirect('task_list')
+ else:
+ form = TaskForm(teacher=teacher)
+
+ return render(request, 'core/tasks/create_task.html', {'form': form})
+
+@login_required
+def task_detail(request, pk):
+ task = get_object_or_404(Task, pk=pk)
+
+ # Check access
+ has_access = False
+ if hasattr(request.user, 'teacher_profile') and task.teacher == request.user.teacher_profile:
+ has_access = True
+ elif hasattr(request.user, 'student_profile') and task.subject in request.user.student_profile.subscribed_subjects.all():
+ has_access = True
+
+ if not has_access:
+ raise PermissionDenied("ليس لديك صلاحية لعرض هذا الواجب.")
+
+ return render(request, 'core/tasks/task_detail.html', {'task': task})
+
+
+# --- Messages Views ---
+
+@login_required
+def inbox(request):
+ messages = Message.objects.filter(recipient=request.user)
+ return render(request, 'core/messages/inbox.html', {'messages': messages})
+
+@login_required
+def outbox(request):
+ messages = Message.objects.filter(sender=request.user)
+ return render(request, 'core/messages/outbox.html', {'messages': messages})
+
+@login_required
+def send_message(request):
+ if request.method == 'POST':
+ form = MessageForm(request.POST, user=request.user)
+ if form.is_valid():
+ recipient_id = form.cleaned_data['recipient_id']
+ subject = form.cleaned_data['subject']
+ body = form.cleaned_data['body']
+
+ if recipient_id == 'all' and hasattr(request.user, 'teacher_profile'):
+ # Send to all students
+ students = Student.objects.filter(
+ subscribed_subjects__teachers=request.user.teacher_profile
+ ).distinct()
+
+ messages_to_create = []
+ for student in students:
+ messages_to_create.append(Message(
+ sender=request.user,
+ recipient=student.user,
+ subject=subject,
+ body=body
+ ))
+ Message.objects.bulk_create(messages_to_create)
+
+ else:
+ # Send to single user
+ recipient = get_object_or_404(User, pk=recipient_id)
+ Message.objects.create(
+ sender=request.user,
+ recipient=recipient,
+ subject=subject,
+ body=body
+ )
+
+ return redirect('inbox')
+ else:
+ form = MessageForm(user=request.user)
+
+ return render(request, 'core/messages/send_message.html', {'form': form})
+
+@login_required
+def message_detail(request, pk):
+ message = get_object_or_404(Message, pk=pk)
+
+ if message.recipient != request.user and message.sender != request.user:
+ raise PermissionDenied("ليس لديك صلاحية لعرض هذه الرسالة.")
+
+ if message.recipient == request.user and not message.is_read:
+ message.is_read = True
+ message.save()
+
+ return render(request, 'core/messages/message_detail.html', {'message': message})
+
+def switch_language(request):
+ current_language = translation.get_language()
+ print(f"SWITCH_LANG: Current: {current_language}")
+
+ if current_language == 'en':
+ new_language = 'ar'
+ else:
+ new_language = 'en'
+
+ print(f"SWITCH_LANG: New: {new_language}")
+
+ translation.activate(new_language)
+ request.session['_language'] = new_language
+ request.session.save() # Explicit save
+
+ referer = request.META.get('HTTP_REFERER')
+ print(f"SWITCH_LANG: Referer: {referer}")
+
+ response = None
+
+ if referer:
+ try:
+ parsed = urlparse(referer)
+ new_url = translate_url(parsed.path, new_language)
+ print(f"SWITCH_LANG: Translated URL: {new_url}")
+
+ if new_url and new_url != parsed.path:
+ response = HttpResponseRedirect(new_url)
+ except Exception as e:
+ print(f"SWITCH_LANG: Error translating URL: {e}")
+ pass
+
+ if not response:
+ # Fallback to admin with prefix
+ fallback_url = f"/{new_language}/admin/"
+ print(f"SWITCH_LANG: Fallback to {fallback_url}")
+ response = HttpResponseRedirect(fallback_url)
+
+ # Also set the cookie to be sure
+ response.set_cookie(settings.LANGUAGE_COOKIE_NAME, new_language)
+ return response
diff --git a/media/platform/smou_logo.png b/media/platform/smou_logo.png
new file mode 100644
index 0000000..54b290a
Binary files /dev/null and b/media/platform/smou_logo.png differ
diff --git a/media/students/scales_80px.png b/media/students/scales_80px.png
new file mode 100644
index 0000000..3467ba6
Binary files /dev/null and b/media/students/scales_80px.png differ
diff --git a/static/css/admin_custom.css b/static/css/admin_custom.css
new file mode 100644
index 0000000..c6fdd39
--- /dev/null
+++ b/static/css/admin_custom.css
@@ -0,0 +1,60 @@
+/* Custom Admin RTL Fixes for Jazzmin/AdminLTE */
+
+/* Ensure sidebar is on the right for RTL */
+[dir="rtl"] .main-sidebar {
+ right: 0 !important;
+ left: auto !important;
+}
+
+/* Adjust content wrapper margin */
+[dir="rtl"] .content-wrapper,
+[dir="rtl"] .main-footer,
+[dir="rtl"] .main-header {
+ margin-right: 250px !important;
+ margin-left: 0 !important;
+}
+
+/* Collapsed sidebar behavior in RTL */
+[dir="rtl"].sidebar-collapse .main-sidebar {
+ margin-right: -250px !important;
+ margin-left: 0 !important;
+}
+[dir="rtl"].sidebar-collapse .content-wrapper,
+[dir="rtl"].sidebar-collapse .main-footer,
+[dir="rtl"].sidebar-collapse .main-header {
+ margin-right: 0 !important;
+}
+
+/* Sidebar Text Alignment - Force Right Alignment */
+[dir="rtl"] .nav-sidebar .nav-item > .nav-link {
+ text-align: right !important;
+}
+
+[dir="rtl"] .nav-sidebar .nav-icon {
+ margin-left: 0.5rem !important;
+ margin-right: 0 !important;
+}
+
+[dir="rtl"] .nav-sidebar .nav-link p {
+ display: inline-block;
+ float: none;
+}
+
+/* Brand Logo Alignment */
+[dir="rtl"] .brand-link {
+ text-align: right;
+}
+[dir="rtl"] .brand-link .brand-image {
+ float: right;
+ margin-left: 0.8rem;
+ margin-right: auto;
+}
+
+/* Top Navbar Alignment */
+[dir="rtl"] .navbar-nav {
+ flex-direction: row;
+}
+[dir="rtl"] .navbar-nav.ml-auto {
+ margin-right: auto !important;
+ margin-left: 0 !important;
+}