From a51298cf71665419e4b09b3951450f2fe0341926 Mon Sep 17 00:00:00 2001
From: Valentin Buira <valentin.buira@gmail.com>
Date: Fri, 19 Jul 2024 13:10:11 +0200
Subject: [PATCH] Add student/university as an option in the industries list

---
 app/icons/Student.svg                   |  5 +++++
 app/icons/icons.qrc                     |  1 +
 app/mmstyle.h                           |  2 ++
 app/qml/account/MMAccountController.qml | 18 ------------------
 app/qml/account/MMHowYouFoundUsPage.qml | 18 ++++++++++++++++++
 app/qml/account/MMWhichIndustryPage.qml | 24 +++++++++++++++++++++++-
 6 files changed, 49 insertions(+), 19 deletions(-)
 create mode 100644 app/icons/Student.svg

diff --git a/app/icons/Student.svg b/app/icons/Student.svg
new file mode 100644
index 000000000..1474d1cfc
--- /dev/null
+++ b/app/icons/Student.svg
@@ -0,0 +1,5 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M28 15H26V21H28V15Z" fill="#FFBABC"/>
+<path d="M17.241 19.7302C16.847 19.9102 16.43 20.0002 16 20.0002C15.57 20.0002 15.153 19.9102 14.76 19.7312L8 16.6582V22.0002C8 24.6262 12.024 26.0002 16 26.0002C19.976 26.0002 24 24.6262 24 22.0002V16.6592L17.241 19.7302Z" fill="#FFBABC"/>
+<path d="M27.414 11.0902L16.414 6.09023C16.151 5.97123 15.85 5.97123 15.587 6.09023L4.587 11.0902C4.229 11.2522 4 11.6072 4 12.0002C4 12.3932 4.229 12.7482 4.586 12.9102L15.586 17.9102C15.718 17.9702 15.859 18.0002 16 18.0002C16.141 18.0002 16.282 17.9702 16.414 17.9102L27.414 12.9102C27.771 12.7482 28 12.3932 28 12.0002C28 11.6072 27.771 11.2522 27.414 11.0902Z" fill="#FFBABC"/>
+</svg>
diff --git a/app/icons/icons.qrc b/app/icons/icons.qrc
index a4f672322..c3f553a97 100644
--- a/app/icons/icons.qrc
+++ b/app/icons/icons.qrc
@@ -96,5 +96,6 @@
         <file>Youtube.svg</file>
         <file>ZoomToProject.svg</file>
         <file>StakeOut.svg</file>
+        <file>Student.svg</file>
     </qresource>
 </RCC>
diff --git a/app/mmstyle.h b/app/mmstyle.h
index 0b548ad7f..9288cd98c 100644
--- a/app/mmstyle.h
+++ b/app/mmstyle.h
@@ -161,6 +161,7 @@ class MMStyle: public QObject
     Q_PROPERTY( QUrl undoIcon READ undoIcon CONSTANT )
     Q_PROPERTY( QUrl waitingIcon READ waitingIcon CONSTANT )
     Q_PROPERTY( QUrl waterResourcesIcon READ waterResourcesIcon CONSTANT )
+    Q_PROPERTY( QUrl studentIcon READ studentIcon CONSTANT )
     Q_PROPERTY( QUrl xTwitterIcon READ xTwitterIcon CONSTANT )
     Q_PROPERTY( QUrl youtubeIcon READ youtubeIcon CONSTANT )
     Q_PROPERTY( QUrl splitGeometryIcon READ splitGeometryIcon CONSTANT )
@@ -450,6 +451,7 @@ class MMStyle: public QObject
     QUrl undoIcon() {return QUrl( "qrc:/Undo.svg" );}
     QUrl waitingIcon() {return QUrl( "qrc:/Waiting.svg" );}
     QUrl waterResourcesIcon() {return QUrl( "qrc:/WaterResources.svg" );}
+    QUrl studentIcon() {return QUrl( "qrc:/Student.svg" );}
     QUrl xTwitterIcon() {return QUrl( "qrc:/XTwitter.svg" );}
     QUrl youtubeIcon() {return QUrl( "qrc:/Youtube.svg" );}
 
diff --git a/app/qml/account/MMAccountController.qml b/app/qml/account/MMAccountController.qml
index bc611853d..96e1ceb3c 100644
--- a/app/qml/account/MMAccountController.qml
+++ b/app/qml/account/MMAccountController.qml
@@ -46,24 +46,6 @@ Item {
     stackView.pop(null);
   }
 
-  function shuffleAndAppend( listModel, items )
-  {
-    items = items
-        .map(function( item ) {
-            return { value: item, sort: Math.random() };
-        })
-        .sort(function( a, b ) {
-            return a.sort - b.sort;
-        })
-        .map(function( obj ) {
-            return obj.value;
-        });
-
-    items.forEach( function( item ) {
-        listModel.append( item );
-    });
-  }
-
   Connections {
     target: __merginApi
     enabled: controller.inProgress
diff --git a/app/qml/account/MMHowYouFoundUsPage.qml b/app/qml/account/MMHowYouFoundUsPage.qml
index cc280a8ed..66a84031e 100644
--- a/app/qml/account/MMHowYouFoundUsPage.qml
+++ b/app/qml/account/MMHowYouFoundUsPage.qml
@@ -228,4 +228,22 @@ MMPage {
       }
     }
   }
+
+  function shuffleAndAppend( listModel, items )
+  {
+    items = items
+        .map(function( item ) {
+            return { value: item, sort: Math.random() };
+        })
+        .sort(function( a, b ) {
+            return a.sort - b.sort;
+        })
+        .map(function( obj ) {
+            return obj.value;
+        });
+
+    items.forEach( function( item ) {
+        listModel.append( item );
+    });
+  }
 }
diff --git a/app/qml/account/MMWhichIndustryPage.qml b/app/qml/account/MMWhichIndustryPage.qml
index e8fb981e3..a0f76766b 100644
--- a/app/qml/account/MMWhichIndustryPage.qml
+++ b/app/qml/account/MMWhichIndustryPage.qml
@@ -38,7 +38,8 @@ MMPage {
         { name: qsTr( "Natural resources" ), key: "natural", icon: __style.naturalResourcesIcon, colorx: __style.earthColor, color: "#4D2A24" },
         { name: qsTr( "Telecom" ), key: "telecom", icon: __style.telecommunicationIcon, colorx: __style.deepOceanColor, color: "#1C324A" },
         { name: qsTr( "Transportation" ), key: "transportation", icon: __style.transportationIcon, colorx: __style.skyColor, color: "#A6CBF4" },
-        { name: qsTr( "Water utilities" ), key: "water", icon: __style.waterResourcesIcon, colorx: __style.lightGreenColor, color: "#EFF5F3" }
+        { name: qsTr( "Water utilities" ), key: "water", icon: __style.waterResourcesIcon, colorx: __style.lightGreenColor, color: "#EFF5F3" },
+        { name: qsTr( "Student/University" ), key: "student", icon: __style.studentIcon, colorx: __style.grapeColor, color: "#5A2740" }
       ];
 
       var otherItem = { name: qsTr( "Other" ), key: "other", icon: __style.otherIcon, colorx: __style.sunsetColor, color: "#FFB673" };
@@ -217,4 +218,25 @@ MMPage {
       }
     }
   }
+
+  function shuffleAndAppend( listModel, items )
+  {
+    items = items
+        .map(function( item ) {
+            return { value: item, sort: Math.random() };
+        })
+        .sort(function( a, b ) {
+            return a.sort - b.sort;
+        })
+        .map(function( obj ) {
+            return obj.value;
+        });
+
+    items.forEach( function( item ) {
+        listModel.append( item );
+    });
+  }
 }
+
+
+