Ross Marks

Fork: 0

0xRoM / moodlog_web

Browse code hopefully final ui and logic changes for a while master
1 parent dfa969b commit 7e94873de9d3ae795f409069a42d17a2f1730c48 0xRoM authored on 14 Jan 2024

Patch

Unified Split

Showing 3 changed files

                Ignore Space
               Show notes
              View
            
          
          18 ■■■■■
          habit.php
             $jsonArray['weekGoal'] = $multiplier;
 
            if( $weekCount < $multiplier )
                $jsonArray['buttonClass'] = 'button-yellow';
                //if($todayCheck)
                if($todayCheck)
                    $jsonArray['buttonText'] = $weekCount;
            if($weekCount >= $multiplier)
                $jsonArray['buttonClass'] = 'button-done';
            if( $todayCheck ) {
                $jsonArray['buttonClass'] = 'button-neut';
                if($weekCount >= $multiplier)
                if($weekCount >= $multiplier){
                    $jsonArray['buttonClass'] = 'button-good';
                    $jsonArray['buttonText'] = "";
                }
            }
            break;
        }
    }
                $jsonArray['buttonText'] = $weekCount;
                $jsonArray['buttonClass'] = 'button-yellow';
            } elseif ($weekCount >= $multiplier) {
                $jsonArray['buttonClass'] = 'button-done';
            } elseif ($todayCheck) {
                if($todayCheck){
                    $jsonArray['buttonClass'] = 'button-good';
                    $jsonArray['buttonText'] = "";
                }
            } 
            if ($todayCheck) {
                $jsonArray['buttonClass'] = 'button-neut';
 
                if ($weekCount >= $multiplier) {
                    $jsonArray['buttonClass'] = 'button-good';
             $jsonArray['weekGoal'] = $multiplier;
             if( $weekCount < $multiplier )
                 $jsonArray['buttonClass'] = 'button-yellow';
+                //if($todayCheck)
+                if($todayCheck)
                     $jsonArray['buttonText'] = $weekCount;
             if($weekCount >= $multiplier)
                 $jsonArray['buttonClass'] = 'button-done';
             if( $todayCheck ) {
                 $jsonArray['buttonClass'] = 'button-neut';
+                if($weekCount >= $multiplier)
+                if($weekCount >= $multiplier){
                     $jsonArray['buttonClass'] = 'button-good';
+                    $jsonArray['buttonText'] = "";
+                }
             }
             break;
         }
     }
                 $jsonArray['buttonText'] = $weekCount;
                 $jsonArray['buttonClass'] = 'button-yellow';
             } elseif ($weekCount >= $multiplier) {
                 $jsonArray['buttonClass'] = 'button-done';
+            } elseif ($todayCheck) {
+                if($todayCheck){
+                    $jsonArray['buttonClass'] = 'button-good';
+                    $jsonArray['buttonText'] = "";
+                }
+            }
+            if ($todayCheck) {
                 $jsonArray['buttonClass'] = 'button-neut';
                 if ($weekCount >= $multiplier) {
                     $jsonArray['buttonClass'] = 'button-good';

                Ignore Space
               Show notes
              View
            
          
          16 ■■■■■
          habit_ui.php
             if ($value === 0)
                $last10_conv[$key] = "red"; 
        }
 
		if ($weekCount < $multiplier) {
	
        if ($weekCount < $multiplier) {
            $buttText = $weekCount;
            $buttonClass = 'button-yellow';
        } elseif ($weekCount >= $multiplier) {
            $buttonClass = 'button-done';
        } elseif ($todayCheck) {
            if($todayCheck){
                $buttonClass= 'button-good';
                $buttText = "";
            }
        } 
        if ($todayCheck) {
            $buttonClass = 'button-neut';
 
            if ($weekCount >= $multiplier) {
                $buttonClass = 'button-good';
             if ($value === 0)
                 $last10_conv[$key] = "red";
         }
+		if ($weekCount < $multiplier) {
+        if ($weekCount < $multiplier) {
             $buttText = $weekCount;
             $buttonClass = 'button-yellow';
         } elseif ($weekCount >= $multiplier) {
             $buttonClass = 'button-done';
+        } elseif ($todayCheck) {
+            if($todayCheck){
+                $buttonClass= 'button-good';
+                $buttText = "";
+            }
+        }
+        if ($todayCheck) {
             $buttonClass = 'button-neut';
             if ($weekCount >= $multiplier) {
                 $buttonClass = 'button-good';

                Ignore Space
               Show notes
              View
            
          
          4 ■■■■■
          style.css
     font-weight:700;
}
 
.button-done{  background-color: #399113; color:#000; }
.button-good{ background-color: #58e81b; color:#000; }
.button-good{ background-color: #58e81b; color:#58e81b; }
.button-bad{ background-color: #e81b1b; color:#000; }
.button-neut{ background-color: #efe23e; color:#000; }
 
.habit-score{
.habit-cal-week .r1{ fill:#efe23e; }
.habit-cal-week .r2{ fill:#58e81b; }
.habit-cal-week .r0{ fill:#000; }
 
.week-container .green{ background-color: #58e81b; }
.week-container .green{ background-color: #58e81b;  color: #58e81b; }
.week-container .neut{ 
	background-color: #efe23e;
    color: #111;
    font-weight: 700;
     font-weight:700;
 }
 .button-done{  background-color: #399113; color:#000; }
+.button-good{ background-color: #58e81b; color:#000; }
+.button-good{ background-color: #58e81b; color:#58e81b; }
 .button-bad{ background-color: #e81b1b; color:#000; }
 .button-neut{ background-color: #efe23e; color:#000; }
 .habit-score{
 .habit-cal-week .r1{ fill:#efe23e; }
 .habit-cal-week .r2{ fill:#58e81b; }
 .habit-cal-week .r0{ fill:#000; }
+.week-container .green{ background-color: #58e81b; }
+.week-container .green{ background-color: #58e81b;  color: #58e81b; }
 .week-container .neut{
 	background-color: #efe23e;
     color: #111;
     font-weight: 700;

Show line notes below