Remove External app for unsupported devices (web/n0100) and adds a basic examination checking system

Makefile

@@ -1,5 +1,11 @@
 include build/config.mak
 
+ifeq (${DEVICE}, n0110)
+  apps_list = ${EPSILON_APPS}
+else
+  apps_list = $(foreach i, ${EPSILON_APPS}, $(if $(filter external, $(i)),,$(i)))
+endif
+
 # Disable default Make rules
 .SUFFIXES:
 

apps/Makefile

@@ -3,12 +3,12 @@ include apps/home/Makefile
 include apps/on_boarding/Makefile
 include apps/hardware_test/Makefile
 include apps/usb/Makefile
-apps =
 
+apps =
 # All selected apps are included. Each Makefile below is responsible for setting
 # the $apps variable (name of the app class) and the $app_headers
 # (path to the apps header).
-$(foreach i,${EPSILON_APPS},$(eval include apps/$(i)/Makefile))
+$(foreach i,${apps_list},${eval include apps/$(i)/Makefile})
 
 app_src += $(addprefix apps/,\
   apps_container.cpp \
@@ -43,7 +43,7 @@ snapshots_construction = $(foreach i,$(apps),,m_snapshot$(subst :,,$(i))Snapshot
 snapshots_list = $(foreach i,$(apps),,&m_snapshot$(subst :,,$(i))Snapshot)
 snapshots_count = $(words $(apps))
 snapshot_includes = $(foreach i,$(app_headers),-include $(i) )
-epsilon_app_names = '$(foreach i,${EPSILON_APPS},"$(i)", )'
+epsilon_app_names = '$(foreach i,${apps_list},"$(i)", )'
 
 $(call object_for,apps/apps_container_storage.cpp apps/apps_container.cpp apps/main.cpp): CXXFLAGS += $(snapshot_includes) -DAPPS_CONTAINER_APPS_DECLARATION="$(apps_declaration)" -DAPPS_CONTAINER_SNAPSHOT_DECLARATIONS="$(snapshots_declaration)" -DAPPS_CONTAINER_SNAPSHOT_CONSTRUCTORS="$(snapshots_construction)" -DAPPS_CONTAINER_SNAPSHOT_LIST="$(snapshots_list)" -DAPPS_CONTAINER_SNAPSHOT_COUNT=$(snapshots_count) -DEPSILON_APPS_NAMES=$(epsilon_app_names) -DUSERNAME="$(USERNAME)"
 

apps/calculation/app.cpp

@@ -17,6 +17,10 @@ I18n::Message App::Descriptor::upperName() {
   return I18n::Message::CalculAppCapital;
 }
 
+int App::Descriptor::examinationLevel() {
+  return App::Descriptor::StrictExaminationLevel;
+}
+
 const Image * App::Descriptor::icon() {
   return ImageStore::CalculationIcon;
 }

apps/calculation/app.h

@@ -15,6 +15,7 @@ public:
   public:
     I18n::Message name() override;
     I18n::Message upperName() override;
+    int examinationLevel() override;
     const Image * icon() override;
   };
   class Snapshot : public ::App::Snapshot {

apps/code/app.cpp

@@ -14,6 +14,10 @@ I18n::Message App::Descriptor::upperName() {
   return I18n::Message::CodeAppCapital;
 }
 
+int App::Descriptor::examinationLevel() {
+  return App::Descriptor::BasicExaminationLevel;
+}
+
 const Image * App::Descriptor::icon() {
   return ImageStore::CodeIcon;
 }

apps/code/app.h

@@ -18,6 +18,7 @@ public:
   public:
     I18n::Message name() override;
     I18n::Message upperName() override;
+    int examinationLevel() override;
     const Image * icon() override;
   };
   class Snapshot : public ::App::Snapshot {

apps/external/app.cpp

@@ -12,6 +12,10 @@ I18n::Message App::Descriptor::upperName() {
   return I18n::Message::ExternalAppCapital;
 }
 
+int App::Descriptor::examinationLevel() {
+  return App::Descriptor::BasicExaminationLevel;
+}
+
 const Image * App::Descriptor::icon() {
   return ImageStore::ExternalIcon;
 }

apps/external/app.h

@@ -12,6 +12,7 @@ public:
   public:
     I18n::Message name() override;
     I18n::Message upperName() override;
+    int examinationLevel() override;
     const Image * icon() override;
   };
   class Snapshot : public ::App::Snapshot {

apps/graph/app.cpp

@@ -16,6 +16,10 @@ I18n::Message App::Descriptor::upperName() {
   return I18n::Message::FunctionAppCapital;
 }
 
+int App::Descriptor::examinationLevel() {
+  return App::Descriptor::StrictExaminationLevel;
+}
+
 const Image * App::Descriptor::icon() {
   return ImageStore::GraphIcon;
 }

apps/graph/app.h

@@ -17,6 +17,7 @@ public:
   public:
     I18n::Message name() override;
     I18n::Message upperName() override;
+    int examinationLevel() override;
     const Image * icon() override;
   };
   class Snapshot : public Shared::FunctionApp::Snapshot {

apps/home/controller.cpp

@@ -59,8 +59,10 @@ bool Controller::handleEvent(Ion::Events::Event event) {
   if (event == Ion::Events::OK || event == Ion::Events::EXE) {
     AppsContainer * container = AppsContainer::sharedAppsContainer();
     ::App::Snapshot * selectedSnapshot = container->appSnapshotAtIndex(selectionDataSource()->selectedRow()*k_numberOfColumns+selectionDataSource()->selectedColumn()+1);
-    if ((GlobalPreferences::sharedGlobalPreferences()->examMode() == GlobalPreferences::ExamMode::Dutch || GlobalPreferences::sharedGlobalPreferences()->examMode() == GlobalPreferences::ExamMode::NoSym) &&
+    if (((GlobalPreferences::sharedGlobalPreferences()->examMode() == GlobalPreferences::ExamMode::Dutch || GlobalPreferences::sharedGlobalPreferences()->examMode() == GlobalPreferences::ExamMode::NoSym) &&
-      (selectedSnapshot->descriptor()->name() == I18n::Message::CodeApp || selectedSnapshot->descriptor()->name() == I18n::Message::ExternalApp)) {
+      (selectedSnapshot->descriptor()->examinationLevel() < 2)) ||
+      ((GlobalPreferences::sharedGlobalPreferences()->examMode() == GlobalPreferences::ExamMode::Standard) && (selectedSnapshot->descriptor()->examinationLevel() < 1))) {
+      //(selectedSnapshot->descriptor()->name() == I18n::Message::CodeApp || selectedSnapshot->descriptor()->name() == I18n::Message::ExternalApp)) {
       App::app()->displayWarning(I18n::Message::ForbidenAppInExamMode1, I18n::Message::ForbidenAppInExamMode2);
     } else {
       bool switched = container->switchTo(selectedSnapshot);

apps/probability/app.cpp

@@ -15,6 +15,10 @@ I18n::Message App::Descriptor::upperName() {
   return I18n::Message::ProbaAppCapital;
 }
 
+int App::Descriptor::examinationLevel() {
+  return App::Descriptor::StrictExaminationLevel;
+}
+
 const Image * App::Descriptor::icon() {
   return ImageStore::ProbabilityIcon;
 }

apps/probability/app.h

@@ -27,6 +27,7 @@ public:
     public:
       I18n::Message name() override;
       I18n::Message upperName() override;
+      int examinationLevel() override;
       const Image * icon() override;
   };
   class Snapshot : public ::App::Snapshot {

apps/regression/app.cpp

@@ -14,6 +14,10 @@ I18n::Message App::Descriptor::upperName() {
   return I18n::Message::RegressionAppCapital;
 }
 
+int App::Descriptor::examinationLevel() {
+  return App::Descriptor::StrictExaminationLevel;
+}
+
 const Image * App::Descriptor::icon() {
   return ImageStore::RegressionIcon;
 }

apps/regression/app.h

@@ -17,6 +17,7 @@ public:
   public:
     I18n::Message name() override;
     I18n::Message upperName() override;
+    int examinationLevel() override;
     const Image * icon() override;
   };
   class Snapshot : public ::App::Snapshot, public TabViewDataSource {

apps/sequence/app.cpp

@@ -14,6 +14,10 @@ I18n::Message App::Descriptor::upperName() {
   return I18n::Message::SequenceAppCapital;
 }
 
+int App::Descriptor::examinationLevel() {
+  return App::Descriptor::StrictExaminationLevel;
+}
+
 const Image * App::Descriptor::icon() {
   return ImageStore::SequenceIcon;
 }

apps/sequence/app.h

@@ -19,6 +19,7 @@ public:
   public:
     I18n::Message name() override;
     I18n::Message upperName() override;
+    int examinationLevel() override;
     const Image * icon() override;
   };
   class Snapshot : public Shared::FunctionApp::Snapshot {

apps/settings/app.cpp

@@ -12,6 +12,10 @@ I18n::Message App::Descriptor::upperName() {
   return I18n::Message::SettingsAppCapital;
 }
 
+int App::Descriptor::examinationLevel() {
+  return App::Descriptor::StrictExaminationLevel;
+}
+
 const Image * App::Descriptor::icon() {
   return ImageStore::SettingsIcon;
 }

apps/settings/app.h

@@ -12,6 +12,7 @@ public:
   public:
     I18n::Message name() override;
     I18n::Message upperName() override;
+    int examinationLevel() override;
     const Image * icon() override;
   };
   class Snapshot : public ::App::Snapshot {

apps/solver/app.cpp

@@ -14,6 +14,10 @@ I18n::Message App::Descriptor::upperName() {
   return I18n::Message::SolverAppCapital;
 }
 
+int App::Descriptor::examinationLevel() {
+  return App::Descriptor::StrictExaminationLevel;
+}
+
 const Image * App::Descriptor::icon() {
   return ImageStore::SolverIcon;
 }

apps/solver/app.h

@@ -16,6 +16,7 @@ public:
     public:
       I18n::Message name() override;
       I18n::Message upperName() override;
+      int examinationLevel() override;
       const Image * icon() override;
   };
   class Snapshot : public ::App::Snapshot {

apps/statistics/app.cpp

@@ -14,6 +14,10 @@ I18n::Message App::Descriptor::upperName() {
   return I18n::Message::StatsAppCapital;
 }
 
+int App::Descriptor::examinationLevel() {
+  return App::Descriptor::StrictExaminationLevel;
+}
+
 const Image * App::Descriptor::icon() {
   return ImageStore::StatIcon;
 }

apps/statistics/app.h

@@ -17,6 +17,7 @@ public:
   public:
     I18n::Message name() override;
     I18n::Message upperName() override;
+    int examinationLevel() override;
     const Image * icon() override;
   };
   class Snapshot : public ::App::Snapshot, public TabViewDataSource {

escher/include/escher/app.h

@@ -27,7 +27,12 @@ public:
   public:
     virtual I18n::Message name();
     virtual I18n::Message upperName();
+    virtual int examinationLevel();
     virtual const Image * icon();
+
+    const int NoExaminationLevel = 0;
+    const int BasicExaminationLevel = 1;
+    const int StrictExaminationLevel = 2;
   };
   class Snapshot {
   public:

escher/src/app.cpp

@@ -13,6 +13,10 @@ I18n::Message App::Descriptor::upperName() {
   return (I18n::Message)0;
 }
 
+int App::Descriptor::examinationLevel() {
+  return App::Descriptor::NoExaminationLevel;
+}
+
 const Image * App::Descriptor::icon() {
   return nullptr;
 }