fix: make CRN import matching and results consistent

Author: Mqsirrel

src/application/ScheduleMakerApp.js

@@ -28,24 +28,14 @@ export class ScheduleMakerApp {
 
   _init() {
     this.notification = new NotificationManager(); this.helpModal = new HelpModal();
-    this.importModal = new ImportModal({
-      notification: this.notification,
-      onTimetableLoaded: s => this.onTimetableLoaded(s),
-      onCrnsImported: entries => this.onCrnsImported(entries),
-      onOpenHelp: () => this.helpModal.open()
-    });
+    this.importModal = new ImportModal({ notification: this.notification, onTimetableLoaded: s => this.onTimetableLoaded(s), onCrnsImported: entries => this.onCrnsImported(entries), onOpenHelp: () => this.helpModal.open() });
     this.courseSelector = new CourseSelector({ notification: this.notification, onCoursesChange: g => this.onWantedCoursesChanged(g), onGenerate: () => this.generateSchedules() });
     this.calendarGrid = new CalendarGrid('calendarGridMatrix', { onCourseClick: s => this.showCourseDetailModal(s) }); this.tableView = new TableView('scheduleDetailTbody');
     this.filterBar = new FilterBar({ onFilterChange: f => this.applyFilters(f) });
     this.scheduleController = new ScheduleController({ state: this.state, getFilterState: () => this.filterBar.getFilterState() });
     this._initDOMElements();
     this.scheduleActions = new ScheduleActions({ state: this.state, storageService, exportService, notification: this.notification, translate: t });
-    this.resultsView = new ScheduleResultsView({ state: this.state, calendarGrid: this.calendarGrid, tableView: this.tableView, elements: {
-      resultsToolbar: this.resultsToolbar, resultsPlaceholder: this.resultsPlaceholder, calendarViewContainer: this.calendarViewContainer, tableViewContainer: this.tableViewContainer,
-      btnViewCalendar: this.btnViewCalendar, btnViewTable: this.btnViewTable, btnPrevSchedule: this.btnPrevSchedule, btnNextSchedule: this.btnNextSchedule,
-      currScheduleIndex: this.currScheduleIndex, totalSchedulesCount: this.totalSchedulesCount, statScore: this.statScore, valScore: this.valScore,
-      valDaysOff: this.valDaysOff, valTotalGaps: this.valTotalGaps
-    }});
+    this.resultsView = new ScheduleResultsView({ state: this.state, calendarGrid: this.calendarGrid, tableView: this.tableView, elements: { resultsToolbar: this.resultsToolbar, resultsPlaceholder: this.resultsPlaceholder, calendarViewContainer: this.calendarViewContainer, tableViewContainer: this.tableViewContainer, btnViewCalendar: this.btnViewCalendar, btnViewTable: this.btnViewTable, btnPrevSchedule: this.btnPrevSchedule, btnNextSchedule: this.btnNextSchedule, currScheduleIndex: this.currScheduleIndex, totalSchedulesCount: this.totalSchedulesCount, statScore: this.statScore, valScore: this.valScore, valDaysOff: this.valDaysOff, valTotalGaps: this.valTotalGaps }});
     this.diagnosticsView = new ScheduleDiagnosticsView({ element: this.conflictDiagnosticBox, translate: t, escapeHtml: s => this._escapeHtml(s) });
     this.courseDetailView = new CourseDetailView({ modal: this.courseDetailModal, body: this.courseDetailBody, escapeHtml: s => this._escapeHtml(s) });
     this._bindEvents(); this._checkCachedData(); updateDOMTranslations();
@@ -60,12 +50,7 @@ export class ScheduleMakerApp {
     let imported = 0;
     const unmatched = [];
     const duplicate = [];
-    const normalize = value => String(value ?? '')
-      .replace(/\u00a0/g, ' ')
-      .replace(/\s+/g, '')
-      .replace(/^شعبة/i, '')
-      .replace(/^section|^sec|^crn/i, '')
-      .toUpperCase();
+    const normalize = value => String(value ?? '').replace(/\u00a0/g, ' ').replace(/\s+/g, '').replace(/^شعبة/i, '').replace(/^section|^sec|^crn/i, '').toUpperCase();
 
     for (const entry of entries) {
       const wantedCode = normalize(entry.courseCode);
@@ -79,44 +64,27 @@ export class ScheduleMakerApp {
         return secCode === wantedCode && secNumber === wantedNumber && secSection === wantedSection;
       });
 
-      if (!matching.length) {
-        unmatched.push(entry);
-        continue;
-      }
+      if (!matching.length) { unmatched.push(entry); continue; }
 
       const key = `${entry.courseCode.toUpperCase()}-${entry.courseNumber}`;
-      if (this.courseSelector.wantedCourses[key]) {
-        duplicate.push(entry);
-        continue;
-      }
+      if (this.courseSelector.wantedCourses[key]) { duplicate.push(entry); continue; }
 
       this.courseSelector.inputCode.value = entry.courseCode;
       this.courseSelector.inputNumber.value = entry.courseNumber;
       this.courseSelector.inputSection.value = entry.crn;
       this.courseSelector.addCurrentCourse();
-      imported++;
+      if (this.courseSelector.wantedCourses[key]) imported++;
+      else unmatched.push(entry);
     }
 
     if (imported > 0) this.generateSchedules();
 
-    return {
-      extracted: entries.length,
-      imported,
-      unmatched,
-      duplicate,
-      timetableSections: this.courseSelector.allSections.length
-    };
+    return { extracted: entries.length, imported, unmatched, duplicate, timetableSections: this.courseSelector.allSections.length };
   }
 
   loadDemoDataset(){
-    this.courseSelector.clearAll();
-    this.onTimetableLoaded(getSampleSections());
-    setTimeout(()=>{
-      const code=document.getElementById('courseCode'),number=document.getElementById('courseNumber');
-      for(const[c,n]of [['CS','181'],['MATH','101'],['PHYS','101'],['EXP','901'],['EXP','902'],['EXP','903']]){code.value=c;number.value=n;this.courseSelector.addCurrentCourse();}
-      this.notification.showSuccess(getLang()==='ar'?'تم تحميل بيانات تجريبية، ويتم الآن إنشاء جدول مناسب.':'Sample data loaded. Building a schedule now.');
-      this.generateSchedules();
-    },150);
+    this.courseSelector.clearAll(); this.onTimetableLoaded(getSampleSections());
+    setTimeout(()=>{ const code=document.getElementById('courseCode'),number=document.getElementById('courseNumber'); for(const[c,n]of [['CS','181'],['MATH','101'],['PHYS','101'],['EXP','901'],['EXP','902'],['EXP','903']]){code.value=c;number.value=n;this.courseSelector.addCurrentCourse();} this.notification.showSuccess(getLang()==='ar'?'تم تحميل بيانات تجريبية، ويتم الآن إنشاء جدول مناسب.':'Sample data loaded. Building a schedule now.'); this.generateSchedules(); },150);
   }
   onWantedCoursesChanged(groups){this.wantedCourseGroups=groups;if(!groups.length){this.state.resetResults();this.resultsView.updateVisibility();}}
   async generateSchedules(){if(!this.wantedCourseGroups.length)return;const result=await this.scheduleController.generate(this.wantedCourseGroups);if(!result.schedules.length){this.notification.showError(t('toast_no_schedules_found'));this.diagnosticsView.render(this.scheduleController.diagnoseConflicts(this.wantedCourseGroups));this.resultsView.updateVisibility();return;}this.diagnosticsView.render([]);this.notification.playChime();this.notification.showSuccess(t('toast_schedules_found',{count:result.schedules.length}));this.applyFilters(result.filters);}