Merge pull request #386 from Tanza3D/lazer

add lazer only marker

admin/panel/api/apps/medals/get_medals.php

@@ -18,6 +18,7 @@
 Medals.description AS Description,
 Medals.restriction AS Restriction,
 Medals.grouping AS `Grouping`,
+`Medals`.`lazer` AS Lazer,
 Medals.instructions AS Instructions,
 Solutions.solution AS Solution,
 Solutions.mods AS Mods,

admin/panel/api/apps/medals/save_medal.php

@@ -18,7 +18,12 @@
     $firstAchievedDate = null;
 }
 
-Database::execOperation("UPDATE Medals SET packid = ?, video = ?, date = ?, firstachieveddate = ?, firstachievedby = ? WHERE medalid = ?", "ssssii", array($_POST['strSolutionPackID'], $_POST['strSolutionVideo'], $solutionDate, $firstAchievedDate, $_POST['strFirstAchievedId'], $_POST['nMedalId']));
+$lazer = 0;
+
+if($_POST['strSolutionLazer'] == "true") $lazer = 1; 
+
+
+Database::execOperation("UPDATE Medals SET lazer = ?, packid = ?, video = ?, date = ?, firstachieveddate = ?, firstachievedby = ? WHERE medalid = ?", "issssii", array($lazer, $_POST['strSolutionPackID'], $_POST['strSolutionVideo'], $solutionDate, $firstAchievedDate, $_POST['strFirstAchievedId'], $_POST['nMedalId']));
 if ($_POST['bBeatmapLockState'] == "true") {
     Database::execOperation("INSERT IGNORE INTO MedalStructure (Locked, MedalID) VALUES ('1', ?)", "i", array($_POST['nMedalId']));
 } else {

admin/panel/js/apps/medals/medals.js

@@ -384,7 +384,7 @@ function saveMedal(medal, callback) {
     xhr.onload = function () { this.callback.apply(this); };
     xhr.onerror = function () { console.log("Error saving medal."); };
     xhr.send(
-        `strSolutionMods=${medal.Mods}&strNewSolution=${encodeURIComponent(medal.Solution)}&strSolutionPackID=${medal.PackID}&strSolutionVideo=${medal.Video}&strFirstAchievedDate=${medal.FirstAchievedDate}&strFirstAchievedId=${medal.FirstAchievedBy}&nMedalId=${medal.MedalID}&bBeatmapLockState=${medal.Locked}&strSolutionDate=${medal.Date}`
+        `strSolutionMods=${medal.Mods}&strNewSolution=${encodeURIComponent(medal.Solution)}&strSolutionPackID=${medal.PackID}&strSolutionVideo=${medal.Video}&strFirstAchievedDate=${medal.FirstAchievedDate}&strFirstAchievedId=${medal.FirstAchievedBy}&nMedalId=${medal.MedalID}&bBeatmapLockState=${medal.Locked}&strSolutionDate=${medal.Date}&strSolutionLazer=${medal.Lazer}`
     );
 }
 
@@ -457,6 +457,9 @@ function displayMedalInformation() {
 
     // Beatmap Options //
     document.getElementById("medals__lock-submissions").checked = medal.Locked === 1 ? "checked" : ""; // TODO: Why no work?!?
+console.log(medal);
+
+    document.getElementById("medals__lazer").checked = medal.Lazer === 1 ? "checked" : ""; 
 
     if (medal.PackID != null && medal.PackID != "" && medal.PackID != "0") // Thrill of Chaos uses "0" for some reason.
     {
@@ -546,6 +549,7 @@ function updateMedal() {
     medal.FirstAchievedDate = document.getElementById("medals__first-achieved-date").value;
     medal.FirstAchievedBy = document.getElementById("medals__first-achieved-user").value;
     medal.Locked = document.getElementById("medals__lock-submissions").checked;
+    medal.Lazer = document.getElementById("medals__lazer").checked;
     if (document.getElementById("medals__beatmap-packs").checked == true) {
         medal.PackID = `${document.getElementById("medals__beatmap-pack-osu").value},${document.getElementById("medals__beatmap-pack-taiko").value},${document.getElementById("medals__beatmap-pack-catch").value},${document.getElementById("medals__beatmap-pack-mania").value}`;
     } else {

admin/panel/views/apps/medals.php

@@ -79,6 +79,9 @@
                     <textarea class="input" id="medals__medal-solution-textarea"></textarea>
                     <p>Video</p>
                     <input type="text" class="input input-pattern" placeholder="None" id="medals__medal-solution-video" pattern="[0-9A-z-_]{11}">
+                    <label for="medals__lazer" class="checkbox" id="medals__lazer-label">
+                        <input type="checkbox" id="medals__lazer">Supports Lazer</input>
+                    </label>
                 </section>
                 <section>
                     <h1>Mods</h1>
@@ -103,10 +106,10 @@
             <div class="medals__medal-beatmap-options">
                 <h1>Beatmap Options</h1>
                 <label for="medals__lock-submissions" class="checkbox" id="medals__lock-submissions-label">
-                    <input type="checkbox" id="medals__lock-submissions">Lock Submissions
+                    <input type="checkbox" id="medals__lock-submissions">Lock Submissions</input>
                 </label>
                 <label for="medals__beatmap-packs" class="checkbox">
-                    <input type="checkbox" id="medals__beatmap-packs">Beatmap Packs
+                    <input type="checkbox" id="medals__beatmap-packs">Beatmap Packs</input>
                 </label>
                 <div class="medals__beatmap-packs-ids">
                     <p>osu!</p>
@@ -141,4 +144,4 @@
     <div class="basic-page-notes">
         <notes-section></notes-section>
     </div>
-</div>
+</div>

db/1.template.sql

@@ -80,6 +80,7 @@ SELECT Medals.medalid AS MedalID
 	, Medals.link AS Link
 	, Medals.description AS Description
 	, Medals.restriction AS Restriction
+	, Medals.lazer AS Lazer
 	, Medals.grouping AS `Grouping`
 	, Medals.instructions AS Instructions
 	, Solutions.solution AS Solution

medals/api/medals.php

@@ -41,6 +41,7 @@
         , Medals.packid as PackID
         , Medals.firstachieveddate as FirstAchievedDate
         , Medals.firstachievedby as FirstAchievedBy
+        , Medals.lazer as Lazer
         , (CASE WHEN restriction = 'osu' THEN 2 WHEN restriction = 'taiko' THEN 3 WHEN restriction = 'fruits' THEN 4 WHEN restriction = 'mania' THEN 5 ELSE 1 END) AS ModeOrder 
         , Medals.ordering AS Ordering
         , MedalRarity.frequency As Rarity

medals/css/main.css

@@ -166,7 +166,27 @@
 .osekai__mi-text {
     margin-left: 25px;
 }
-
+.osekai__mi-text > div:first-child {
+    display: flex;
+    align-items: center;
+    gap: 5px;
+}
+.stable__only {
+    position: absolute;
+    right: 10px;
+    bottom: 15px;
+    margin-left: 5px;
+    margin-top: 3px;
+    padding: 7px 14px;
+    border-radius: 90px;
+    background-color: var(--flat_bg_a5);
+}
+.stable__only.hidden {
+    display: none !important;
+}
+.stable__only i {
+    margin-right: 2px;
+}
 .osekai__mit-title {
     font-family: Comfortaa;
     font-style: normal;