Merge pull request #167 from aopell/develop

Version 5.5
aopell · Sep 16, 2019 · 363b3eb · 363b3eb
2 parents 58edc39 + ff4d7ec
commit 363b3eb
Show file tree

Hide file tree

Showing 5 changed files with 118 additions and 25 deletions.
diff --git a/js/all.js b/js/all.js
@@ -60,7 +60,7 @@ let modals = [
                                 }
                             }
                             return retVal;
-                        })(["DinosoftLabs", "Eucalyp", "Flat Icons", "Freepik", "Maxim Basinski", "Pixel Buddha", "Smashicons", "Twitter", "Vectors Market", "srip", "surang", "Pixelmeetup"])
+                        })(["DinosoftLabs", "Eucalyp", "Flat Icons", "Freepik", "Maxim Basinski", "Pixel Buddha", "Smashicons", "Twitter", "Vectors Market", "Vitaly Gorbachev", "srip", "surang", "Pixelmeetup"])
                     }),
                     createElement("span", [], { textContent: " from " }),
                     createElement("a", [], { href: "https://www.flaticon.com/", textContent: "flaticon.com" })

diff --git a/js/grades.js b/js/grades.js
@@ -856,6 +856,11 @@ var fetchQueue = [];
     function queueNonenteredAssignment(assignment, courseId) {
         let noGrade = assignment.getElementsByClassName("no-grade")[0];
 
+        if(!noGrade) {
+            Logger.log(`Error loading potentially nonentered assignment with ID ${assignment.dataset.id.substr(2)}`);
+            return;
+        }
+
         if (noGrade.parentElement.classList.contains("exception-grade-wrapper")) {
             noGrade.remove();
             assignment.classList.add("contains-exception")

diff --git a/js/icons.js b/js/icons.js
@@ -1,16 +1,28 @@
 var icons = [
-    //Physical education
+    //Physical education / track and field
     //Source: https://www.flaticon.com/free-icon/speed_181017 by Eucalyp under Flaticon Basic License (CC BY 3.0)
-    { regex: "(\\bPE\\b|Phys(ical)? Edu?(cation)?|\\bSRLA\\b)", url: "https://image.flaticon.com/icons/svg/181/181017.svg" },
+    { regex: "(\\bPE\\b|Phys(ical)? Edu?(cation)?|\\bSRLA\\b|TRK|ADV COND)", url: "https://image.flaticon.com/icons/svg/181/181017.svg" },
     //World History
     //Source: https://www.flaticon.com/free-icon/internet_174249 by Flat Icons under Flaticon Basic License (CC BY 3.0)
     { regex: "WO?R?LD HIST?(ORY)?|WHG", url: "https://image.flaticon.com/icons/svg/174/174249.svg" },
+    //Animation
+    //Source: https://www.flaticon.com/free-icon/animation_2037876 by Flat Icons under Flaticon Basic License (CC BY 3.0)
+    { regex: "ANIMAT", url: "https://image.flaticon.com/icons/svg/2037/2037876.svg" },
+    //Forensics
+    //Source: https://www.flaticon.com/free-icon/forensic-science_1616525 by Flat Icons under Flaticon Basic License (CC BY 3.0)
+    { regex: "FOREN", url: "https://image.flaticon.com/icons/svg/1616/1616525.svg" },
+    //Auto Tech
+    //Source: https://www.flaticon.com/free-icon/car-service_2040989 by Flat Icons under Flaticon Basic License (CC BY 3.0)
+    { regex: "AUTO TECH", url: "https://image.flaticon.com/icons/svg/2040/2040989.svg" },
     //Algebra 1/2
     //Source: https://www.flaticon.com/free-icon/blackboard_167753 by Freepik under Flaticon Basic License (CC BY 3.0)
     { regex: "ALG(EB|EBRA)?(\\d|\\b)", url: "https://image.flaticon.com/icons/svg/167/167753.svg" },
+    //Animal Husbandry
+    //Source: https://www.flaticon.com/free-icon/barn_2109342 by Freepik under Flaticon Basic License (CC BY 3.0)
+    { regex: "ANIMAL", url: "https://image.flaticon.com/icons/svg/2109/2109342.svg" },
     //Art History
     //Source: https://www.flaticon.com/free-icon/paint-brush_214275 by Pixel Buddha under Flaticon Basic License (CC BY 3.0)
-    { regex: "ART HIST", url: "https://image.flaticon.com/icons/svg/214/214275.svg" },
+    { regex: "ART HIST|PAINT", url: "https://image.flaticon.com/icons/svg/214/214275.svg" },
     //European History
     //Source: https://www.flaticon.com/free-icon/europe_664549 by Smashicons under Flaticon Basic License (CC BY 3.0)
     { regex: "EUR", url: "https://image.flaticon.com/icons/svg/664/664549.svg" },
@@ -35,9 +47,9 @@ var icons = [
     //US History and other American studies
     //Source: https://www.flaticon.com/free-icon/united-states-of-america_149513 by Smashicons under Flaticon Basic License (CC BY 3.0)
     { regex: "US HIST|AMER(ICAN?)?|AM DEM", url: "https://image.flaticon.com/icons/svg/149/149513.svg" },
-    //Health
+    //Health / Medical
     //Source: https://www.flaticon.com/free-icon/first-aid-kit_179555 by Pixel Buddha under Flaticon Basic License (CC BY 3.0)
-    { regex: "HEALTH", url: "https://image.flaticon.com/icons/svg/179/179555.svg" },
+    { regex: "HE?A?LTH|MEDICAL|MED INTERVEN", url: "https://image.flaticon.com/icons/svg/179/179555.svg" },
     //Drawing
     //Source: https://www.flaticon.com/free-icon/sketch_681560 by Freepik under Flaticon Basic License (CC BY 3.0)
     { regex: "DRAW|2D|3D", url: "https://image.flaticon.com/icons/svg/681/681560.svg" },
@@ -55,7 +67,7 @@ var icons = [
     { regex: "PSYCH", url: "https://image.flaticon.com/icons/svg/552/552408.svg" },
     //Writing Seminar/AP Seminar
     //Source: https://www.flaticon.com/free-icon/writing_176690 by Freepik under Flaticon Basic License (CC BY 3.0)
-    { regex: "SEM(INAR)?\\b", url: "https://image.flaticon.com/icons/svg/176/176690.svg" },
+    { regex: "SEM(INAR)?\\b|CALLIGRAPHY", url: "https://image.flaticon.com/icons/svg/176/176690.svg" },
     //Discrete Math
     //Source: https://www.flaticon.com/free-icon/calculating_251986 by Freepik under Flaticon Basic License (CC BY 3.0)
     { regex: "DISCR", url: "https://image.flaticon.com/icons/svg/251/251986.svg" },
@@ -67,13 +79,16 @@ var icons = [
     { regex: "BAND|MAR DYN", url: "https://image.flaticon.com/icons/svg/718/718543.svg" },
     //Music
     //Source: https://www.flaticon.com/free-icon/treble-clef_579496 by Twitter under CC BY 3.0
-    { regex: "MUSIC|JAZZ|CHOIR|INSTRUM", url: "https://image.flaticon.com/icons/svg/579/579496.svg" },
+    { regex: "MUSIC|JAZZ|CHOIR|INSTRUM|WIND PERC", url: "https://image.flaticon.com/icons/svg/579/579496.svg" },
     //Biology
     //Source: https://www.flaticon.com/free-icon/dna_620366 by Freepik under Flaticon Basic License (CC BY 3.0)
-    { regex: "BIO(LOGY|TECH)?\\b", url: "https://image.flaticon.com/icons/svg/620/620366.svg" },
+    { regex: "BIO(LOGY|TECH|MED)?\\b", url: "https://image.flaticon.com/icons/svg/620/620366.svg" },
     //Literature
     //Source: https://www.flaticon.com/free-icon/open-book_167755 by Freepik under Flaticon Basic License (CC BY 3.0)
-    { regex: "(^|\\b)LIT(ERATURE)?\\b", url: "https://image.flaticon.com/icons/svg/167/167755.svg" },
+    { regex: "(^|\\b)LIT(ERATURE)?\\b|READ", url: "https://image.flaticon.com/icons/svg/167/167755.svg" },
+    //Advertising Design
+    //Source: https://www.flaticon.com/free-icon/ads_1055664 by Freepik under Flaticon Basic License (CC BY 3.0)
+    { regex: "ADVT DES", url: "https://image.flaticon.com/icons/svg/1055/1055664.svg" },
     //Economics
     //Source: https://www.flaticon.com/free-icon/profit_712743 by DinosoftLabs under Flaticon Basic License (CC BY 3.0)
     { regex: "ECON(O(MICS)?)?", url: "https://image.flaticon.com/icons/svg/712/712743.svg" },
@@ -82,13 +97,19 @@ var icons = [
     { regex: "STAT(STICS|ISTCS)|STATS?|STATISTICS", url: "https://image.flaticon.com/icons/svg/1006/1006636.svg" },
     //Film
     //Source: https://www.flaticon.com/free-icon/video-camera_321799 by Vectors Market under Flaticon Basic License (CC BY 3.0)
-    { regex: "FILM(MAKING)?\\b", url: "https://image.flaticon.com/icons/svg/321/321799.svg" },
+    { regex: "FILM(MAKING)?\\b|VIDEO", url: "https://image.flaticon.com/icons/svg/321/321799.svg" },
+    //First Responder
+    //Source: https://www.flaticon.com/free-icon/ambulance_119083 by Freepik under Flaticon Basic License (CC BY 3.0)
+    { regex: "FIRST RESPONDER", url: "https://image.flaticon.com/icons/svg/119/119083.svg" },
     //Geology
     //Source: https://www.flaticon.com/free-icon/science_184647 by Freepik under Flaticon Basic License (CC BY 3.0)
     { regex: "GEOLOGY", url: "https://image.flaticon.com/icons/svg/184/184647.svg" },
+    //Cooking
+    //Source: https://www.flaticon.com/free-icon/cooking_1142696 by Freepik under Flaticon Basic License (CC BY 3.0)
+    { regex: "COOK|CULINARY", url: "https://image.flaticon.com/icons/svg/1142/1142696.svg" },
     //Government
     //Source: https://www.flaticon.com/free-icon/university_167718 by Freepik under Flaticon Basic License (CC BY 3.0)
-    { regex: "\\bGOVT\\b", url: "https://image.flaticon.com/icons/svg/167/167718.svg" },
+    { regex: "\\bGOVT\\b|YOU ADM JUS", url: "https://image.flaticon.com/icons/svg/167/167718.svg" },
     //Geometry
     //Source: https://www.flaticon.com/free-icon/office-material_258316 by Freepik under Flaticon Basic License (CC BY 3.0)
     { regex: "GEOM", url: "https://image.flaticon.com/icons/svg/258/258316.svg" },
@@ -110,24 +131,45 @@ var icons = [
     //Robotics
     //Source: https://www.flaticon.com/free-icon/robotic-arm_1546683 by Eucalyp under Flaticon Basic License (CC BY 3.0)
     { regex: "ROBOT", url: "https://image.flaticon.com/icons/svg/1546/1546683.svg" },
+    //Media
+    //Source: https://www.flaticon.com/free-icon/media-player_1649092 by Eucalyp under Flaticon Basic License (CC BY 3.0)
+    { regex: "MEDIA", url: "https://image.flaticon.com/icons/svg/1649/1649092.svg" },
+    //Cybersecurity
+    //Source: https://www.flaticon.com/free-icon/cyber-security_2084028 by Eucalyp under Flaticon Basic License (CC BY 3.0)
+    { regex: "CYBER", url: "https://image.flaticon.com/icons/svg/2084/2084028.svg" },
     //Flight and Space
     //Source: https://www.flaticon.com/free-icon/globe_744502 by Vectors Market under Flaticon Basic License (CC BY 3.0)
     { regex: "FLIGHT|SPACE", url: "https://image.flaticon.com/icons/svg/744/744502.svg" },
     //Geography
     //Source: https://www.flaticon.com/free-icon/globe_717982 by DinosoftLabs under Flaticon Basic License (CC BY 3.0)
-    { regex: "GEOG", url: "https://image.flaticon.com/icons/svg/717/717982.svg" },
+    { regex: "GEOG|HUMAN GEO", url: "https://image.flaticon.com/icons/svg/717/717982.svg" },
     //Art (Generic)
     //Source: https://www.flaticon.com/free-icon/creativity_1497573 by Smashicons under Flaticon Basic License (CC BY 3.0)
-    { regex: "(^|\\b)ART\\b", url: "https://image.flaticon.com/icons/svg/1497/1497573.svg" },
+    { regex: "(^|\\b)ART\\b|DES CRAFT", url: "https://image.flaticon.com/icons/svg/1497/1497573.svg" },
+    //American Sign Language
+    //Source: https://www.flaticon.com/free-icon/sign-language_2014363 by Smashicons under Flaticon Basic License (CC BY 3.0)
+    { regex: "AM SIGN LNG", url: "https://image.flaticon.com/icons/svg/2014/2014363.svg" },
     //Dance
     //Source: https://www.flaticon.com/free-icon/dancing_493507 by Freepik under Flaticon Basic License (CC BY 3.0)
-    { regex: "DANCE", url: "https://image.flaticon.com/icons/svg/493/493507.svg" },
+    { regex: "DANCE|DN CH|DNC CMNTY", url: "https://image.flaticon.com/icons/svg/493/493507.svg" },
+    //App Development
+    //Source: https://www.flaticon.com/free-icon/smartphone_186239 by Freepik under Flaticon Basic License (CC BY 3.0)
+    { regex: "APP CREAT", url: "https://image.flaticon.com/icons/svg/186/186239.svg" },
     //Museum Studies
     //Source: https://www.flaticon.com/free-icon/banks_252032 by Freepik under Flaticon Basic License (CC BY 3.0)
     { regex: "MUSEUM", url: "https://image.flaticon.com/icons/svg/252/252032.svg" },
     //Golf
     //Source: https://www.flaticon.com/free-icon/golf_1584143 by Freepik under Flaticon Basic License (CC BY 3.0)
     { regex: "GOLF", url: "https://image.flaticon.com/icons/svg/1584/1584143.svg" },
+    //Japanese
+    //Source: https://www.flaticon.com/free-icon/japan_206789 by Freepik under Flaticon Basic License (CC BY 3.0)
+    { regex: "JAPAN", url: "https://image.flaticon.com/icons/svg/206/206789.svg" },
+    //Mexico
+    //Source: https://www.flaticon.com/free-icon/mexico_206600 by Freepik under Flaticon Basic License (CC BY 3.0)
+    { regex: "MEX", url: "https://image.flaticon.com/icons/svg/206/206600.svg" },
+    //Russian
+    //Source: https://www.flaticon.com/free-icon/russia_206604 by Freepik under Flaticon Basic License (CC BY 3.0)
+    { regex: "RUSSIA", url: "https://image.flaticon.com/icons/svg/206/206604.svg" },
     //English Language Development
     //Source: https://www.flaticon.com/free-icon/book_947478 by Eucalyp under Flaticon Basic License (CC BY 3.0)
     { regex: "(^|\\b)ELD\\b|(^|\\b)ELL\\b", url: "https://image.flaticon.com/icons/svg/947/947478.svg" },
@@ -136,13 +178,13 @@ var icons = [
     { regex: "(^|\\b)THEA(TER)?\\b|DRAMA", url: "https://image.flaticon.com/icons/svg/214/214351.svg" },
     //Leadership
     //Source: https://www.flaticon.com/free-icon/government_1534091 by Freepik under Flaticon Basic License (CC BY 3.0)
-    { regex: "LEADERSHIP", url: "https://image.flaticon.com/icons/svg/1534/1534091.svg" },
+    { regex: "LEADER", url: "https://image.flaticon.com/icons/svg/1534/1534091.svg" },
     //TA, Peer Counseling, Tutor
     //Source: https://www.flaticon.com/free-icon/collaboration_1402119 by Eucalyp under Flaticon Basic License (CC BY 3.0)
-    { regex: "SERVICE|PEER COUNSELING|TUTOR|INTRO SOCIO", url: "https://image.flaticon.com/icons/svg/1402/1402119.svg" },
-    // IB Middle Years Program Sci/Tech, Creative Expression
+    { regex: "SERVICE|PEER COUNSELING|TUTOR|INTRO SOCIO|AVID|ETHNIC", url: "https://image.flaticon.com/icons/svg/1402/1402119.svg" },
+    // IB Middle Years Program Sci/Tech, Creative Expression, STEM/STEAM
     //Source: https://www.flaticon.com/free-icon/idea_1460471 by Eucalyp under Flaticon Basic License (CC BY 3.0)
-    { regex: "MYP ST TECH|PRN ENGINEER|CREAT EXP", url: "https://image.flaticon.com/icons/svg/1460/1460471.svg" },
+    { regex: "MYP ST TECH|PRN ENGINEER|CREAT EXP|STEA?M|MULTICRAFT CORE", url: "https://image.flaticon.com/icons/svg/1460/1460471.svg" },
     //Latin
     //Source: https://www.flaticon.com/free-icon/manuscript_1020074 by Freepik under Flaticon Basic License (CC BY 3.0)
     { regex: "LATIN", url: "https://image.flaticon.com/icons/svg/1020/1020074.svg" },
@@ -151,7 +193,7 @@ var icons = [
     { regex: "HUMANITI?E?S?|LIFE MGMT", url: "https://image.flaticon.com/icons/svg/1205/1205495.svg" },
     //Yearbook
     //Source: https://www.flaticon.com/free-icon/memories_1006107 by Freepik under Flaticon Basic License (CC BY 3.0)
-    { regex: "YEARBOOK|DIG IMAG", url: "https://image.flaticon.com/icons/svg/1006/1006107.svg" },
+    { regex: "YEARBOOK|DIG IMAG|PHOTO", url: "https://image.flaticon.com/icons/svg/1006/1006107.svg" },
     //Networking
     //Source: https://www.flaticon.com/free-icon/network_1554377 by srip under Flaticon Basic License (CC BY 3.0)
     { regex: "NETWORKING", url: "https://image.flaticon.com/icons/svg/1554/1554377.svg" },
@@ -166,22 +208,34 @@ var icons = [
     { regex: "CAREER|JOB", url: "https://image.flaticon.com/icons/svg/149/149018.svg" },
     //Advisory, Homeroom, No Period
     //Source: https://www.flaticon.com/free-icon/books_167756 by Freepik under Flaticon Basic License (CC BY 3.0)
-    { regex: "ADVIS|HOME|SOCIAL COM", url: "https://image.flaticon.com/icons/svg/167/167756.svg" },
+    { regex: "ADVIS|HOME|SOCIAL COM|GRADE \\d", url: "https://image.flaticon.com/icons/svg/167/167756.svg" },
     //Swimming
     //Source: https://www.flaticon.com/free-icon/swimming_124212 by Freepik under Flaticon Basic License (CC BY 3.0)
     { regex: "SWIM", url: "https://image.flaticon.com/icons/svg/124/124212.svg" },
+    //Volleyball
+    //Source: https://www.flaticon.com/free-icon/volley-ball_68175 by Freepik under Flaticon Basic License (CC BY 3.0)
+    { regex: "VO?LLE?YBA?LL?", url: "https://image.flaticon.com/icons/svg/68/68175.svg" },
+    //Football
+    //Source: https://www.flaticon.com/free-icon/american-football_167741 by Freepik under Flaticon Basic License (CC BY 3.0)
+    { regex: "FOOTBALL", url: "https://image.flaticon.com/icons/svg/167/167741.svg" },
     //Journalism
     //Source: https://www.flaticon.com/free-icon/communication_1720094 by Freepik under Flaticon Basic License (CC BY 3.0)
-    { regex: "JOURNALISM", url: "https://image.flaticon.com/icons/svg/1720/1720094.svg" },
+    { regex: "JOURNALI?SM", url: "https://image.flaticon.com/icons/svg/1720/1720094.svg" },
     //Tennis
     //Source: https://www.flaticon.com/free-icon/tennis_1645793 by Eucalyp under Flaticon Basic License (CC BY 3.0)
     { regex: "TENNIS", url: "https://image.flaticon.com/icons/svg/1645/1645793.svg" },
     //Speech (and Debate?)
     //Source: https://www.flaticon.com/free-icon/speak_512500 by Twitter under CC BY 3.0
     { regex: "SPEECH", url: "https://image.flaticon.com/icons/svg/512/512500.svg" },
+    //Wrestling
+    //Source: https://www.flaticon.com/free-icon/wrestling_577132 by Twitter under CC BY 3.0
+    { regex: "WRESTLING", url: "https://image.flaticon.com/icons/svg/577/577132.svg" },
     //Game Design
     //Source: https://www.flaticon.com/free-icon/computer_1737285 by Eucalyp under Flaticon Basic License (CC BY 3.0)
     { regex: "GAME DSGN", url: "https://image.flaticon.com/icons/svg/1737/1737285.svg" },
+    //Food / Cooking
+    //Source: https://www.flaticon.com/free-icon/dining_2082063 by Eucalyp under Flaticon Basic License (CC BY 3.0)
+    { regex: "FOOD|COOK", url: "https://image.flaticon.com/icons/svg/2082/2082063.svg" },
     //Graphic Design
     //Source: https://www.flaticon.com/free-icon/layers_148862 by Smashicons under Flaticon Basic License (CC BY 3.0)
     { regex: "GRAPHIC DESIGN", url: "https://image.flaticon.com/icons/svg/148/148862.svg" },
@@ -191,12 +245,21 @@ var icons = [
     //Horticulture
     //Source: https://www.flaticon.com/free-icon/sprout_346195 by Freepik under Flaticon Basic License (CC BY 3.0)
     { regex: "HORT", url: "https://image.flaticon.com/icons/svg/346/346195.svg" },
+    //Arabic
+    //Source: https://www.flaticon.com/free-icon/pattern_1704491 by Freepik under Flaticon Basic License (CC BY 3.0)
+    { regex: "ARABIC", url: "https://image.flaticon.com/icons/svg/1704/1704491.svg" },
     //History (Generic)
     //Source: https://www.flaticon.com/free-icon/parchment_1501478 by surang under Flaticon Basic License (CC BY 3.0)
     { regex: "HIST", url: "https://image.flaticon.com/icons/svg/1501/1501478.svg" },
     //Science (Generic)
     //Source: https://image.flaticon.com/icons/svg/167/167733.svg by Freepik under Flaticon Basic License (CC BY 3.0)
-    { regex: "SCI", url: "https://image.flaticon.com/icons/svg/167/167733.svg" },
+    { regex: "SCI|ISCS", url: "https://image.flaticon.com/icons/svg/167/167733.svg" },
+    //Baseball
+    //Source: https://www.flaticon.com/free-icon/baseball_164991 by Freepik under Flaticon Basic License (CC BY 3.0)
+    { regex: "BASEBALL", url: "https://image.flaticon.com/icons/svg/164/164991.svg" },
+    // Physiology
+    // Source: https://www.flaticon.com/free-icon/x-ray_2044715 by Vitaly Gorbachev under Flaticon Basic License (CC BY 3.0)
+    { regex: "PHYSIO", url: "https://image.flaticon.com/icons/svg/2044/2044715.svg"},
     //Math (Generic)
     //Source: https://www.flaticon.com/free-icon/mathematics_1284095 by surang under Flaticon Basic License (CC BY 3.0)
     { regex: "(^|\\b)MATH", url: "https://image.flaticon.com/icons/svg/1284/1284095.svg" },