khaledmahfouz5/AL-Najeeb-System
1
0
نسخ 0
الشفرة المشكلات طلبات السحب Actions Packages المشاريع الإصدارات الويكي النشاط

Enhance the adding/removing students feature

تصفح المصدر 
- version : 1.6
- description : making a dropdown for searching for a specific student
  and add an option to add/remove points for every students .
//############################################//
	modified:   app.py
	modified:   templates/points.html
//############################################//
هذا الالتزام موجود في:
Khaled Mahfouz
2025-07-10 13:15:01 +03:00
الأصل 55c5c4d6a8
التزام a3788e843a
2 ملفات معدلة مع 169 إضافات و99 حذوفات
تنزيل ملف التصحيح تنزيل ملف الاختلاف توسيع جميع الملفات طي جميع الملفات

136
app.py
عرض الملف

@@ -34,12 +34,11 @@ def init_db():
memorizing TEXT NOT NULL,
notes TEXT,
registration_date TEXT NOT NULL,
points INTEGER DEFAULT 0 NOT NULL -- New: Points field, defaults to 0
points INTEGER DEFAULT 0 NOT NULL
)
''')
# Add indexes for faster search
conn.execute('CREATE INDEX idx_student_name ON students(student_name)')
conn.execute('CREATE INDEX idx_parent_name ON students(parent_name)') # Changed from idx_parent_phone
conn.execute('CREATE INDEX idx_parent_name ON students(parent_name)')
print("Database initialized with schema constraints and indexes")
@app.cli.command('init-db')
@@ -51,19 +50,16 @@ def init_db_command():
def validate_phone(phone):
return bool(app.config['PHONE_REGEX'].match(phone)) if phone else True
# MODIFIED: Removed 'points' from validation
def validate_student_data(form_data, is_csv=False):
errors = []
required_fields = ['student_name', 'age', 'parent_name',
'parent_phone_1', 'grade', 'school_name',
'address', 'memorizing']
# Check required fields
for field in required_fields:
if not form_data.get(field):
errors.append(f"حقل '{field}' مطلوب")
# Validate phone formats
phones = [
('parent_phone_1', form_data.get('parent_phone_1')),
('parent_phone_2', form_data.get('parent_phone_2')),
@@ -74,7 +70,6 @@ def validate_student_data(form_data, is_csv=False):
if value and not validate_phone(value):
errors.append(f"رقم الهاتف '{field}' غير صالح. يجب أن يكون 10 أرقام ويبدأ بـ 09")
# Validate age
try:
age = int(form_data.get('age', 0))
if not (5 <= age <= 25):
@@ -82,7 +77,6 @@ def validate_student_data(form_data, is_csv=False):
except ValueError:
errors.append("العمر يجب أن يكون رقماً صحيحاً")
# Validate registration_date format if provided
reg_date_str = form_data.get('registration_date')
if reg_date_str:
try:
@@ -97,7 +91,6 @@ def validate_student_data(form_data, is_csv=False):
def index():
try:
with get_db_connection() as conn:
# MODIFIED: Added points to the SELECT statement
students = conn.execute('''
SELECT id, student_name, age, parent_name, parent_phone_1, parent_phone_2,
student_phone, grade, school_name, address, memorizing, notes,
@@ -138,13 +131,9 @@ def add_student():
form_data['memorizing'],
form_data.get('notes') or None,
registration_date,
# MODIFIED: No points input from form, it will use the DEFAULT 0 from schema
# You don't need to explicitly pass 0 here, as the database will handle it.
# If you did pass it, it would be `0` here.
)
with get_db_connection() as conn:
# MODIFIED: Removed 'points' from INSERT statement
conn.execute('''
INSERT INTO students (
student_name, age, parent_name,
@@ -170,7 +159,6 @@ def modify_student(student_id):
if request.method == 'GET':
try:
with get_db_connection() as conn:
# MODIFIED: Added points to the SELECT statement
student = conn.execute('''
SELECT id, student_name, age, parent_name, parent_phone_1, parent_phone_2,
student_phone, grade, school_name, address, memorizing, notes,
@@ -195,7 +183,6 @@ def modify_student(student_id):
flash(error, 'danger')
try:
with get_db_connection() as conn:
# MODIFIED: Added points to the SELECT statement
student = conn.execute('''
SELECT id, student_name, age, parent_name, parent_phone_1, parent_phone_2,
student_phone, grade, school_name, address, memorizing, notes,
@@ -208,18 +195,15 @@ def modify_student(student_id):
registration_date = form_data.get('registration_date')
if not registration_date:
# MODIFIED: Preserve original registration_date if not provided on update
# Fetch original date from DB if not provided in form.
# This requires fetching the student first if registration_date isn't present in form_data
try:
with get_db_connection() as conn:
original_student = conn.execute('SELECT registration_date FROM students WHERE id = ?', (student_id,)).fetchone()
if original_student:
registration_date = original_student['registration_date']
else:
registration_date = datetime.date.today().isoformat() # Fallback
registration_date = datetime.date.today().isoformat()
except sqlite3.Error:
registration_date = datetime.date.today().isoformat() # Fallback on DB error
registration_date = datetime.date.today().isoformat()
try:
student_data = (
@@ -235,13 +219,10 @@ def modify_student(student_id):
form_data['memorizing'],
form_data.get('notes') or None,
registration_date,
# MODIFIED: No points input from form, ensure points are *not* updated here
student_id
)
with get_db_connection() as conn:
# MODIFIED: Removed 'points' from UPDATE statement in modify_student
# The points should only be modifiable via the points page.
conn.execute('''
UPDATE students SET
student_name = ?,
@@ -292,7 +273,6 @@ def import_csv():
valid_rows = []
row_errors = []
# MODIFIED: CSV now has 12 columns: existing 10 + notes + registration_date (points are DEFAULT)
expected_columns = 12
for i, row in enumerate(csv_reader, 1):
@@ -300,7 +280,6 @@ def import_csv():
row_errors.append(f'السطر {i}: عدد الأعمدة غير صحيح ({expected_columns} مطلوبة)')
continue
# Map CSV columns to form fields
student_data = {
'student_name': row[0].strip(),
'age': row[1].strip(),
@@ -314,20 +293,16 @@ def import_csv():
'memorizing': row[9].strip(),
'notes': row[10].strip(),
'registration_date': row[11].strip()
# MODIFIED: No 'points' expected from CSV input, it will default to 0
}
# If registration_date is empty in CSV, set to current date
if not student_data['registration_date']:
student_data['registration_date'] = datetime.date.today().isoformat()
# Validate row
errors = validate_student_data(student_data, is_csv=True)
if errors:
row_errors.append(f'السطر {i}: {"; ".join(errors)}')
continue
# Prepare for insertion (points will default to 0)
valid_rows.append((
student_data['student_name'],
int(student_data['age']),
@@ -341,7 +316,6 @@ def import_csv():
student_data['memorizing'],
student_data['notes'] or None,
student_data['registration_date']
# No points value here, it relies on DEFAULT 0
))
if row_errors:
@@ -353,7 +327,6 @@ def import_csv():
if valid_rows:
with get_db_connection() as conn:
# MODIFIED: Removed 'points' from INSERT statement for CSV import
conn.executemany('''
INSERT INTO students (
student_name, age, parent_name,
@@ -374,76 +347,89 @@ def import_csv():
return redirect(url_for('index'))
# Route to download the CSV template
@app.route('/download_csv_template')
def download_csv_template():
# The directory where the template.csv is located (your templates folder)
return send_from_directory(app.template_folder, 'template.csv', as_attachment=True)
# Route for the "تسجيل حضور أو حفظ" page
@app.route('/record')
def record():
return render_template('record.html')
# MODIFIED: Points route is already updated from previous turn, just ensure the logic
# prevents negative points (which it already does).
@app.route('/points', methods=['GET', 'POST'])
def points():
if request.method == 'POST':
student_id = request.form.get('student_id')
# Check for 'all_students' checkbox first
apply_to_all_students = 'all_students' in request.form
student_id = request.form.get('student_id') # This will be empty if 'all_students' is checked
point_amount_str = request.form.get('point_amount')
operation = request.form.get('operation') # 'add' or 'remove'
if not student_id or not point_amount_str or not operation:
flash('الرجاء تعبئة جميع الحقول المطلوبة.', 'danger')
if (not apply_to_all_students and not student_id) or not point_amount_str or not operation:
flash('الرجاء اختيار طالب واحد على الأقل (أو كل الطلاب) وتعبئة جميع الحقول المطلوبة.', 'danger')
return redirect(url_for('points'))
try:
student_id = int(student_id)
point_amount = int(point_amount_str)
if point_amount < 0:
flash('قيمة النقاط لا يمكن أن تكون سالبة.', 'danger')
return redirect(url_for('points'))
if point_amount == 0:
flash('الرجاء إدخال قيمة نقاط أكبر من صفر.', 'warning')
if point_amount <= 0: # Changed from < 0 to <= 0
flash('الرجاء إدخال قيمة نقاط أكبر من صفر.', 'danger')
return redirect(url_for('points'))
with get_db_connection() as conn:
student = conn.execute('SELECT points, student_name FROM students WHERE id = ?', (student_id,)).fetchone()
if student is None:
flash('الطالب غير موجود.', 'danger')
return redirect(url_for('points'))
current_points = student['points']
student_name = student['student_name']
new_points = current_points
if operation == 'add':
new_points += point_amount
flash_message = f'تمت إضافة {point_amount} نقطة للطالب {student_name}.'
flash_category = 'success'
elif operation == 'remove':
# Prevent negative points: cap at 0 if removal amount exceeds current points
if current_points < point_amount:
flash_message = (f'لا يمكن خصم {point_amount} نقطة من {student_name} حيث يمتلك {current_points} نقطة فقط. '
f'تم خصم {current_points} نقطة وتم تعيين النقاط إلى 0.')
new_points = 0 # Ensure it doesn't go below zero
flash_category = 'warning'
else:
new_points -= point_amount
flash_message = f'تم خصم {point_amount} نقطة من الطالب {student_name}.'
flash_category = 'success'
students_to_update = []
if apply_to_all_students:
students_to_update = conn.execute('SELECT id, student_name, points FROM students').fetchall()
else:
flash('عملية غير صالحة.', 'danger')
# Fetch single student if not applying to all
student = conn.execute('SELECT id, student_name, points FROM students WHERE id = ?', (student_id,)).fetchone()
if student:
students_to_update.append(student)
else:
flash('الطالب المحدد غير موجود.', 'danger')
return redirect(url_for('points'))
if not students_to_update:
flash('لا يوجد طلاب لتحديث نقاطهم.', 'warning')
return redirect(url_for('points'))
conn.execute('UPDATE students SET points = ? WHERE id = ?', (new_points, student_id))
updated_count = 0
for student in students_to_update:
current_points = student['points']
student_name = student['student_name']
new_points = current_points
applied_amount = point_amount # Amount actually applied for logging/messages
if operation == 'add':
new_points += point_amount
flash_message_prefix = f'تمت إضافة {point_amount} نقطة لـ {student_name}.'
elif operation == 'remove':
if current_points < point_amount:
applied_amount = current_points # Only remove what's available
new_points = 0 # Cap at zero
flash_message_prefix = (f'لا يمكن خصم {point_amount} نقطة من {student_name} حيث يمتلك {current_points} نقطة فقط. '
f'تم خصم {applied_amount} نقطة وتعيين النقاط إلى 0.')
else:
new_points -= point_amount
flash_message_prefix = f'تم خصم {point_amount} نقطة من {student_name}.'
else:
flash('عملية غير صالحة.', 'danger')
return redirect(url_for('points'))
conn.execute('UPDATE students SET points = ? WHERE id = ?', (new_points, student['id']))
updated_count += 1
# Flash message per student if not all, or accumulate for all
if not apply_to_all_students:
flash(f'{flash_message_prefix} النقاط الجديدة لـ {student_name}: {new_points}', 'success' if new_points >=0 else 'warning') # category based on points
conn.commit()
flash(f'{flash_message} النقاط الجديدة لـ {student_name}: {new_points}', flash_category)
if apply_to_all_students:
total_students = len(students_to_update)
flash_op_text = "إضافة" if operation == "add" else "خصم"
flash(f'تم {flash_op_text} {point_amount} نقطة لـ {updated_count} طالب بنجاح.', 'success')
except ValueError:
flash('النقاط وقيمة الطالب يجب أن تكون أرقاماً صحيحة.', 'danger')
flash('النقاط يجب أن تكون أرقاماً صحيحة.', 'danger')
except sqlite3.Error as e:
flash(f'خطأ في قاعدة البيانات: {str(e)}', 'danger')
except Exception as e:
@@ -460,7 +446,6 @@ def points():
flash(f'خطأ في قاعدة البيانات: {str(e)}', 'danger')
return render_template('points.html', students=[])
@app.route('/delete_student/<int:student_id>', methods=['POST'])
def delete_student(student_id):
try:
@@ -480,6 +465,5 @@ def delete_student(student_id):
return redirect(url_for('index'))
if __name__ == '__main__':
app.run(debug=True)
app.run(debug=True)

132
templates/points.html
عرض الملف

@@ -24,13 +24,24 @@
<h2 class="text-2xl font-semibold mb-6 text-gray-800 border-b pb-4">إدارة نقاط الطلاب</h2>
<form id="points-form" action="{{ url_for('points') }}" method="POST">
<div class="mb-6">
<label for="student_id" class="block text-sm font-medium text-gray-700 mb-1">اسم الطالب</label>
<select name="student_id" id="student_id" required class="w-full px-4 py-2 border border-gray-300 rounded-lg shadow-sm focus:outline-none focus:ring-2 focus:ring-blue-500">
<option value="">اختر طالباً...</option>
{% for student in students %}
<option value="{{ student.id }}">{{ student.student_name }} (النقاط الحالية: {{ student.points }})</option>
{% endfor %}
</select>
<label class="block text-sm font-medium text-gray-700 mb-2">اختر الطلاب:</label>
<div class="flex items-center mb-3">
<input type="checkbox" id="all_students_checkbox" name="all_students" class="h-4 w-4 text-blue-600 border-gray-300 rounded focus:ring-blue-500">
<label for="all_students_checkbox" class="ml-2 block text-sm text-gray-900 cursor-pointer">كل الطلاب</label>
</div>
<div id="individual_student_selection">
<label for="search_student_input" class="block text-sm font-medium text-gray-700 mb-1">ابحث عن طالب</label>
<input type="text" id="search_student_input" placeholder="اكتب اسم الطالب للبحث..."
class="w-full px-4 py-2 border border-gray-300 rounded-lg shadow-sm focus:outline-none focus:ring-2 focus:ring-blue-500 text-right" dir="rtl">
<select name="student_id" id="student_id" required size="5"
class="w-full px-4 py-2 border border-gray-300 rounded-lg shadow-sm focus:outline-none focus:ring-2 focus:ring-blue-500 mt-2">
<option value="">اختر طالباً...</option>
{% for student in students %}
<option value="{{ student.id }}" data-student-name="{{ student.student_name }}">{{ student.student_name }} (النقاط الحالية: {{ student.points }})</option>
{% endfor %}
</select>
</div>
</div>
<div class="mb-6 flex space-x-4 space-x-reverse">
@@ -99,13 +110,77 @@
const submitPointsBtn = document.getElementById('submit-points-btn');
const quickAddButtons = document.querySelectorAll('.quick-add-btn');
// Function to update the submit button state (disabled/enabled)
const searchStudentInput = document.getElementById('search_student_input');
const studentSelect = document.getElementById('student_id');
const studentOptions = Array.from(studentSelect.options);
// New elements
const allStudentsCheckbox = document.getElementById('all_students_checkbox');
const individualStudentSelectionDiv = document.getElementById('individual_student_selection');
// Function to perform a fuzzy match (same as before)
function fuzzyMatch(pattern, text) {
pattern = pattern.toLowerCase();
text = text.toLowerCase();
let patternIdx = 0;
let textIdx = 0;
while (patternIdx < pattern.length && textIdx < text.length) {
if (pattern[patternIdx] === text[textIdx]) {
patternIdx++;
}
textIdx++;
}
return patternIdx === pattern.length;
}
// Function to filter dropdown options (updated to respect allStudentsCheckbox)
function filterStudentDropdown() {
if (allStudentsCheckbox.checked) {
return; // Do not filter if 'All Students' is checked
}
const searchTerm = searchStudentInput.value.trim();
studentSelect.innerHTML = ''; // Clear current options
const defaultOption = document.createElement('option');
defaultOption.value = '';
defaultOption.textContent = 'اختر طالباً...';
studentSelect.appendChild(defaultOption);
if (searchTerm === '') {
studentOptions.forEach(option => {
if (option.value !== '') { // Re-add only actual student options
studentSelect.appendChild(option.cloneNode(true));
}
});
} else {
studentOptions.forEach(option => {
const studentName = option.dataset.studentName;
if (option.value !== '' && studentName && fuzzyMatch(searchTerm, studentName)) {
studentSelect.appendChild(option.cloneNode(true));
}
});
}
// Ensure the selected value remains valid or reset if hidden
if (studentSelect.value !== '' && studentSelect.selectedOptions[0].parentElement !== studentSelect) {
studentSelect.value = ''; // Deselect if the current choice is now hidden
}
updateSubmitButtonState();
}
// Function to update the submit button state (modified for all_students_checkbox)
function updateSubmitButtonState() {
const studentSelected = document.getElementById('student_id').value !== '';
const studentSelected = studentSelect.value !== '';
const allStudentsChecked = allStudentsCheckbox.checked;
const amountEntered = pointAmountInput.value.trim() !== '' && parseInt(pointAmountInput.value) > 0;
const operationSelected = operationInput.value !== '';
if (studentSelected && amountEntered && operationSelected) {
// The button is enabled if:
// (a specific student is selected OR all students checkbox is checked)
// AND a valid amount is entered
// AND an operation (add/remove) is selected
if ((studentSelected || allStudentsChecked) && amountEntered && operationSelected) {
submitPointsBtn.disabled = false;
submitPointsBtn.classList.remove('bg-gray-400', 'hover:bg-gray-500');
submitPointsBtn.classList.add('bg-blue-600', 'hover:bg-blue-700');
@@ -116,22 +191,35 @@
}
}
// Event listeners for Add/Remove buttons
// Event listener for All Students checkbox
allStudentsCheckbox.addEventListener('change', () => {
if (allStudentsCheckbox.checked) {
individualStudentSelectionDiv.classList.add('hidden'); // Hide individual selection
studentSelect.removeAttribute('required'); // No longer required if all students
studentSelect.value = ''; // Clear selection
searchStudentInput.value = ''; // Clear search input
filterStudentDropdown(); // Reset dropdown visually
} else {
individualStudentSelectionDiv.classList.remove('hidden'); // Show individual selection
studentSelect.setAttribute('required', 'required'); // Make dropdown required again
}
updateSubmitButtonState();
});
addPointsBtn.addEventListener('click', () => {
operationInput.value = 'add';
addPointsBtn.classList.add('bg-green-700'); // Darker green when active
removePointsBtn.classList.remove('bg-red-700'); // Remove darker red if it was active
addPointsBtn.classList.add('bg-green-700');
removePointsBtn.classList.remove('bg-red-700');
updateSubmitButtonState();
});
removePointsBtn.addEventListener('click', () => {
operationInput.value = 'remove';
removePointsBtn.classList.add('bg-red-700'); // Darker red when active
addPointsBtn.classList.remove('bg-green-700'); // Remove darker green if it was active
removePointsBtn.classList.add('bg-red-700');
addPointsBtn.classList.remove('bg-green-700');
updateSubmitButtonState();
});
// Event listener for quick add buttons
quickAddButtons.forEach(button => {
button.addEventListener('click', () => {
pointAmountInput.value = button.dataset.points;
@@ -139,22 +227,20 @@
});
});
// Event listener for manual input change
pointAmountInput.addEventListener('input', updateSubmitButtonState);
// Event listener for student selection change
document.getElementById('student_id').addEventListener('change', updateSubmitButtonState);
studentSelect.addEventListener('change', updateSubmitButtonState);
searchStudentInput.addEventListener('input', filterStudentDropdown);
// Initial state check when the page loads
// Trigger checkbox change listener on load to set initial state
allStudentsCheckbox.dispatchEvent(new Event('change'));
updateSubmitButtonState();
// Prevent double submission
const pointsForm = document.getElementById('points-form');
if (pointsForm) {
pointsForm.addEventListener('submit', () => {
submitPointsBtn.disabled = true;
submitPointsBtn.textContent = 'جاري المعالجة...'; // "Processing..."
submitPointsBtn.textContent = 'جاري المعالجة...';
});
}
</script>