Luca Parisio před 1 rokem
rodič
revize
9f41d3d043
16 změnil soubory, kde provedl 55 přidání a 43 odebrání
  1. binární
      .DS_Store
  2. binární
      app/.DS_Store
  3. binární
      app/Http/.DS_Store
  4. binární
      database/.DS_Store
  5. binární
      public/.DS_Store
  6. binární
      public/assets/.DS_Store
  7. binární
      public/assets/fonts/.DS_Store
  8. binární
      public/assets/js/.DS_Store
  9. binární
      public/css/.DS_Store
  10. binární
      resources/.DS_Store
  11. binární
      resources/views/.DS_Store
  12. 44 38
      resources/views/livewire/course_list.blade.php
  13. 11 5
      routes/web.php
  14. binární
      storage/.DS_Store
  15. binární
      storage/framework/.DS_Store
  16. binární
      tests/.DS_Store

binární
.DS_Store


binární
app/.DS_Store


binární
app/Http/.DS_Store


binární
database/.DS_Store


binární
public/.DS_Store


binární
public/assets/.DS_Store


binární
public/assets/fonts/.DS_Store


binární
public/assets/js/.DS_Store


binární
public/css/.DS_Store


binární
resources/.DS_Store


binární
resources/views/.DS_Store


+ 44 - 38
resources/views/livewire/course_list.blade.php

@@ -96,6 +96,8 @@
         <hr size="1">
     </div>
 
+    <button style="display:none" class="btn--ui btNewPayment" onclick="newPayment()">NUOVO PAGAMENTO</button>
+
     <section id="resume-table">
         <div class="compare--chart_wrapper d-none"></div>
 
@@ -147,19 +149,19 @@
             <tfoot id="checkall-target">
                 <tr>
                     <th colspan="2"></th>
-                    <th></th>
-                    <th></th>
-                    <th></th>
-                    <th></th>
-                    <th></th>
-                    <th></th>
-                    <th></th>
-                    <th></th>
-                    <th></th>
-                    <th></th>
-                    <th></th>
-                    <th></th>
-                    <th></th>
+                    <th style="padding-left:5px !important;padding-right:5px !important;"></th>
+                    <th style="padding-left:5px !important;padding-right:5px !important;"></th>
+                    <th style="padding-left:5px !important;padding-right:5px !important;"></th>
+                    <th style="padding-left:5px !important;padding-right:5px !important;"></th>
+                    <th style="padding-left:5px !important;padding-right:5px !important;"></th>
+                    <th style="padding-left:5px !important;padding-right:5px !important;"></th>
+                    <th style="padding-left:5px !important;padding-right:5px !important;"></th>
+                    <th style="padding-left:5px !important;padding-right:5px !important;"></th>
+                    <th style="padding-left:5px !important;padding-right:5px !important;"></th>
+                    <th style="padding-left:5px !important;padding-right:5px !important;"></th>
+                    <th style="padding-left:5px !important;padding-right:5px !important;"></th>
+                    <th style="padding-left:5px !important;padding-right:5px !important;"></th>
+                    <th style="padding-left:5px !important;padding-right:5px !important;"></th>
                 </tr>
             </tfoot>
         </table>
@@ -193,6 +195,10 @@
         .select2 {
             width:100% !important;
         }
+        tfoot #checkall-target > tr > th
+        {
+            padding-right:5px !important;
+        }
     </style>
     <script src="https://code.jquery.com/jquery-2.2.4.min.js" integrity="sha256-BbhdlvQf/xTY9gja0Dq3HiwQF8LaCRTXxZKRutelT44=" crossorigin="anonymous"></script>
     <script src="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/js/select2.min.js"></script>
@@ -409,7 +415,7 @@
                         data: 'column_2',
                         render: function (data, type, row){
                             const x = data.split("§");
-                            var ret = '<a class="' + (x[0] == 1 ? 'green' : 'orange') + ' sub_' + row["column_16"] + '" onclick="setSubscription(' + row["column_15"] + ', ' + row["column_17"] + ', ' + row["column_16"] + ')" style="cursor: pointer;"><small>' + x[1] + '</small></a>';
+                            var ret = '<a style="width:100%;float:right; text-align:right; display:block;" class="' + (x[0] == 1 ? 'green' : 'orange') + ' sub_' + row["column_16"] + '" onclick="setSubscription(' + row["column_15"] + ', ' + row["column_17"] + ', ' + row["column_16"] + ')" style="cursor: pointer;"><small>' + x[1] + '</small></a>';
                             return ret;
                         }
                     },
@@ -420,12 +426,12 @@
                             var ret = '';
                             if (x[0] == 'orange')
                             {
-                                ret = '<a class="' + x[0] + ' lnk_' + row["column_16"] + '" id="lnk_' + row["column_15"] + '_' + meta.row + '_' + row["column_17"] + '" onclick="setPayMonth(' + row["column_15"] + ', ' + meta.row + ', ' + row["column_17"] + ', ' + row["column_16"] + ')" style="cursor: pointer;"><small>' + x[1] + '</small></a>';
+                                ret = '<a style="width:100%;float:right; text-align:right; display:block;" class="' + x[0] + ' lnk_' + row["column_16"] + '" id="lnk_' + row["column_15"] + '_' + meta.row + '_' + row["column_17"] + '" onclick="setPayMonth(' + row["column_15"] + ', ' + meta.row + ', ' + row["column_17"] + ', ' + row["column_16"] + ')" style="cursor: pointer;"><small>' + x[1] + '</small></a>';
                             }
                             else
                             {
                                 if (x[0] != 'grey')
-                                    ret = '<a class="' + x[0] + '"><small>' + x[1] + '</small></a>';
+                                    ret = '<a style="width:100%;float:right; text-align:right; display:block;" class="' + x[0] + '"><small>' + x[1] + '</small></a>';
                             }
                             return ret;
                         }
@@ -437,12 +443,12 @@
                             var ret = '';
                             if (x[0] == 'orange')
                             {
-                                ret = '<a class="' + x[0] + ' lnk_' + row["column_16"] + '" id="lnk_' + row["column_15"] + '_' + meta.row + '_' + row["column_17"] + '" onclick="setPayMonth(' + row["column_15"] + ', ' + meta.row + ', ' + row["column_17"] + ', ' + row["column_16"] + ')" style="cursor: pointer;"><small>' + x[1] + '</small></a>';
+                                ret = '<a style="width:100%;float:right; text-align:right; display:block;" class="' + x[0] + ' lnk_' + row["column_16"] + '" id="lnk_' + row["column_15"] + '_' + meta.row + '_' + row["column_17"] + '" onclick="setPayMonth(' + row["column_15"] + ', ' + meta.row + ', ' + row["column_17"] + ', ' + row["column_16"] + ')" style="cursor: pointer;"><small>' + x[1] + '</small></a>';
                             }
                             else
                             {
                                 if (x[0] != 'grey')
-                                    ret = '<a class="' + x[0] + '"><small>' + x[1] + '</small></a>';
+                                    ret = '<a style="width:100%;float:right; text-align:right; display:block;" class="' + x[0] + '"><small>' + x[1] + '</small></a>';
                             }
                             return ret;
                         }
@@ -454,12 +460,12 @@
                             var ret = '';
                             if (x[0] == 'orange')
                             {
-                                ret = '<a class="' + x[0] + ' lnk_' + row["column_16"] + '" id="lnk_' + row["column_15"] + '_' + meta.row + '_' + row["column_17"] + '" onclick="setPayMonth(' + row["column_15"] + ', ' + meta.row + ', ' + row["column_17"] + ', ' + row["column_16"] + ')" style="cursor: pointer;"><small>' + x[1] + '</small></a>';
+                                ret = '<a style="width:100%;float:right; text-align:right; display:block;" class="' + x[0] + ' lnk_' + row["column_16"] + '" id="lnk_' + row["column_15"] + '_' + meta.row + '_' + row["column_17"] + '" onclick="setPayMonth(' + row["column_15"] + ', ' + meta.row + ', ' + row["column_17"] + ', ' + row["column_16"] + ')" style="cursor: pointer;"><small>' + x[1] + '</small></a>';
                             }
                             else
                             {
                                 if (x[0] != 'grey')
-                                    ret = '<a class="' + x[0] + '"><small>' + x[1] + '</small></a>';
+                                    ret = '<a style="width:100%;float:right; text-align:right; display:block;" class="' + x[0] + '"><small>' + x[1] + '</small></a>';
                             }
                             return ret;
                         }
@@ -471,12 +477,12 @@
                             var ret = '';
                             if (x[0] == 'orange')
                             {
-                                ret = '<a class="' + x[0] + ' lnk_' + row["column_16"] + '" id="lnk_' + row["column_15"] + '_' + meta.row + '_' + row["column_17"] + '" onclick="setPayMonth(' + row["column_15"] + ', ' + meta.row + ', ' + row["column_17"] + ', ' + row["column_16"] + ')" style="cursor: pointer;"><small>' + x[1] + '</small></a>';
+                                ret = '<a style="width:100%;float:right; text-align:right; display:block;" class="' + x[0] + ' lnk_' + row["column_16"] + '" id="lnk_' + row["column_15"] + '_' + meta.row + '_' + row["column_17"] + '" onclick="setPayMonth(' + row["column_15"] + ', ' + meta.row + ', ' + row["column_17"] + ', ' + row["column_16"] + ')" style="cursor: pointer;"><small>' + x[1] + '</small></a>';
                             }
                             else
                             {
                                 if (x[0] != 'grey')
-                                    ret = '<a class="' + x[0] + '"><small>' + x[1] + '</small></a>';
+                                    ret = '<a style="width:100%;float:right; text-align:right; display:block;" class="' + x[0] + '"><small>' + x[1] + '</small></a>';
                             }
                             return ret;
                         }
@@ -488,12 +494,12 @@
                             var ret = '';
                             if (x[0] == 'orange')
                             {
-                                ret = '<a class="' + x[0] + ' lnk_' + row["column_16"] + '" id="lnk_' + row["column_15"] + '_' + meta.row + '_' + row["column_17"] + '" onclick="setPayMonth(' + row["column_15"] + ', ' + meta.row + ', ' + row["column_17"] + ', ' + row["column_16"] + ')" style="cursor: pointer;"><small>' + x[1] + '</small></a>';
+                                ret = '<a style="width:100%;float:right; text-align:right; display:block;" class="' + x[0] + ' lnk_' + row["column_16"] + '" id="lnk_' + row["column_15"] + '_' + meta.row + '_' + row["column_17"] + '" onclick="setPayMonth(' + row["column_15"] + ', ' + meta.row + ', ' + row["column_17"] + ', ' + row["column_16"] + ')" style="cursor: pointer;"><small>' + x[1] + '</small></a>';
                             }
                             else
                             {
                                 if (x[0] != 'grey')
-                                    ret = '<a class="' + x[0] + '"><small>' + x[1] + '</small></a>';
+                                    ret = '<a style="width:100%;float:right; text-align:right; display:block;" class="' + x[0] + '"><small>' + x[1] + '</small></a>';
                             }
                             return ret;
                         }
@@ -505,12 +511,12 @@
                             var ret = '';
                             if (x[0] == 'orange')
                             {
-                                ret = '<a class="' + x[0] + ' lnk_' + row["column_16"] + '" id="lnk_' + row["column_15"] + '_' + meta.row + '_' + row["column_17"] + '" onclick="setPayMonth(' + row["column_15"] + ', ' + meta.row + ', ' + row["column_17"] + ', ' + row["column_16"] + ')" style="cursor: pointer;"><small>' + x[1] + '</small></a>';
+                                ret = '<a style="width:100%;float:right; text-align:right; display:block;" class="' + x[0] + ' lnk_' + row["column_16"] + '" id="lnk_' + row["column_15"] + '_' + meta.row + '_' + row["column_17"] + '" onclick="setPayMonth(' + row["column_15"] + ', ' + meta.row + ', ' + row["column_17"] + ', ' + row["column_16"] + ')" style="cursor: pointer;"><small>' + x[1] + '</small></a>';
                             }
                             else
                             {
                                 if (x[0] != 'grey')
-                                    ret = '<a class="' + x[0] + '"><small>' + x[1] + '</small></a>';
+                                    ret = '<a style="width:100%;float:right; text-align:right; display:block;" class="' + x[0] + '"><small>' + x[1] + '</small></a>';
                             }
                             return ret;
                         }
@@ -522,12 +528,12 @@
                             var ret = '';
                             if (x[0] == 'orange')
                             {
-                                ret = '<a class="' + x[0] + ' lnk_' + row["column_16"] + '" id="lnk_' + row["column_15"] + '_' + meta.row + '_' + row["column_17"] + '" onclick="setPayMonth(' + row["column_15"] + ', ' + meta.row + ', ' + row["column_17"] + ', ' + row["column_16"] + ')" style="cursor: pointer;"><small>' + x[1] + '</small></a>';
+                                ret = '<a style="width:100%;float:right; text-align:right; display:block;" class="' + x[0] + ' lnk_' + row["column_16"] + '" id="lnk_' + row["column_15"] + '_' + meta.row + '_' + row["column_17"] + '" onclick="setPayMonth(' + row["column_15"] + ', ' + meta.row + ', ' + row["column_17"] + ', ' + row["column_16"] + ')" style="cursor: pointer;"><small>' + x[1] + '</small></a>';
                             }
                             else
                             {
                                 if (x[0] != 'grey')
-                                    ret = '<a class="' + x[0] + '"><small>' + x[1] + '</small></a>';
+                                    ret = '<a style="width:100%;float:right; text-align:right; display:block;" class="' + x[0] + '"><small>' + x[1] + '</small></a>';
                             }
                             return ret;
                         }
@@ -539,12 +545,12 @@
                             var ret = '';
                             if (x[0] == 'orange')
                             {
-                                ret = '<a class="' + x[0] + ' lnk_' + row["column_16"] + '" id="lnk_' + row["column_15"] + '_' + meta.row + '_' + row["column_17"] + '" onclick="setPayMonth(' + row["column_15"] + ', ' + meta.row + ', ' + row["column_17"] + ', ' + row["column_16"] + ')" style="cursor: pointer;"><small>' + x[1] + '</small></a>';
+                                ret = '<a style="width:100%;float:right; text-align:right; display:block;" class="' + x[0] + ' lnk_' + row["column_16"] + '" id="lnk_' + row["column_15"] + '_' + meta.row + '_' + row["column_17"] + '" onclick="setPayMonth(' + row["column_15"] + ', ' + meta.row + ', ' + row["column_17"] + ', ' + row["column_16"] + ')" style="cursor: pointer;"><small>' + x[1] + '</small></a>';
                             }
                             else
                             {
                                 if (x[0] != 'grey')
-                                    ret = '<a class="' + x[0] + '"><small>' + x[1] + '</small></a>';
+                                    ret = '<a style="width:100%;float:right; text-align:right; display:block;" class="' + x[0] + '"><small>' + x[1] + '</small></a>';
                             }
                             return ret;
                         }
@@ -556,12 +562,12 @@
                             var ret = '';
                             if (x[0] == 'orange')
                             {
-                                ret = '<a class="' + x[0] + ' lnk_' + row["column_16"] + '" id="lnk_' + row["column_15"] + '_' + meta.row + '_' + row["column_17"] + '" onclick="setPayMonth(' + row["column_15"] + ', ' + meta.row + ', ' + row["column_17"] + ', ' + row["column_16"] + ')" style="cursor: pointer;"><small>' + x[1] + '</small></a>';
+                                ret = '<a style="width:100%;float:right; text-align:right; display:block;" class="' + x[0] + ' lnk_' + row["column_16"] + '" id="lnk_' + row["column_15"] + '_' + meta.row + '_' + row["column_17"] + '" onclick="setPayMonth(' + row["column_15"] + ', ' + meta.row + ', ' + row["column_17"] + ', ' + row["column_16"] + ')" style="cursor: pointer;"><small>' + x[1] + '</small></a>';
                             }
                             else
                             {
                                 if (x[0] != 'grey')
-                                    ret = '<a class="' + x[0] + '"><small>' + x[1] + '</small></a>';
+                                    ret = '<a style="width:100%;float:right; text-align:right; display:block;" class="' + x[0] + '"><small>' + x[1] + '</small></a>';
                             }
                             return ret;
                         }
@@ -573,12 +579,12 @@
                             var ret = '';
                             if (x[0] == 'orange')
                             {
-                                ret = '<a class="' + x[0] + ' lnk_' + row["column_16"] + '" id="lnk_' + row["column_15"] + '_' + meta.row + '_' + row["column_17"] + '" onclick="setPayMonth(' + row["column_15"] + ', ' + meta.row + ', ' + row["column_17"] + ', ' + row["column_16"] + ')" style="cursor: pointer;"><small>' + x[1] + '</small></a>';
+                                ret = '<a style="width:100%;float:right; text-align:right; display:block;" class="' + x[0] + ' lnk_' + row["column_16"] + '" id="lnk_' + row["column_15"] + '_' + meta.row + '_' + row["column_17"] + '" onclick="setPayMonth(' + row["column_15"] + ', ' + meta.row + ', ' + row["column_17"] + ', ' + row["column_16"] + ')" style="cursor: pointer;"><small>' + x[1] + '</small></a>';
                             }
                             else
                             {
                                 if (x[0] != 'grey')
-                                    ret = '<a class="' + x[0] + '"><small>' + x[1] + '</small></a>';
+                                    ret = '<a style="width:100%;float:right; text-align:right; display:block;" class="' + x[0] + '"><small>' + x[1] + '</small></a>';
                             }
                             return ret;
                         }
@@ -590,12 +596,12 @@
                             var ret = '';
                             if (x[0] == 'orange')
                             {
-                                ret = '<a class="' + x[0] + ' lnk_' + row["column_16"] + '" id="lnk_' + row["column_15"] + '_' + meta.row + '_' + row["column_17"] + '" onclick="setPayMonth(' + row["column_15"] + ', ' + meta.row + ', ' + row["column_17"] + ', ' + row["column_16"] + ')" style="cursor: pointer;"><small>' + x[1] + '</small></a>';
+                                ret = '<a style="width:100%;float:right; text-align:right; display:block;" class="' + x[0] + ' lnk_' + row["column_16"] + '" id="lnk_' + row["column_15"] + '_' + meta.row + '_' + row["column_17"] + '" onclick="setPayMonth(' + row["column_15"] + ', ' + meta.row + ', ' + row["column_17"] + ', ' + row["column_16"] + ')" style="cursor: pointer;"><small>' + x[1] + '</small></a>';
                             }
                             else
                             {
                                 if (x[0] != 'grey')
-                                    ret = '<a class="' + x[0] + '"><small>' + x[1] + '</small></a>';
+                                    ret = '<a style="width:100%;float:right; text-align:right; display:block;" class="' + x[0] + '"><small>' + x[1] + '</small></a>';
                             }
                             return ret;
                         }
@@ -607,12 +613,12 @@
                             var ret = '';
                             if (x[0] == 'orange')
                             {
-                                ret = '<a class="' + x[0] + ' lnk_' + row["column_16"] + '" id="lnk_' + row["column_15"] + '_' + meta.row + '_' + row["column_17"] + '" onclick="setPayMonth(' + row["column_15"] + ', ' + meta.row + ', ' + row["column_17"] + ', ' + row["column_16"] + ')" style="cursor: pointer;"><small>' + x[1] + '</small></a>';
+                                ret = '<a style="width:100%;float:right; text-align:right; display:block;" class="' + x[0] + ' lnk_' + row["column_16"] + '" id="lnk_' + row["column_15"] + '_' + meta.row + '_' + row["column_17"] + '" onclick="setPayMonth(' + row["column_15"] + ', ' + meta.row + ', ' + row["column_17"] + ', ' + row["column_16"] + ')" style="cursor: pointer;"><small>' + x[1] + '</small></a>';
                             }
                             else
                             {
                                 if (x[0] != 'grey')
-                                    ret = '<a class="' + x[0] + '"><small>' + x[1] + '</small></a>';
+                                    ret = '<a style="width:100%;float:right; text-align:right; display:block;" class="' + x[0] + '"><small>' + x[1] + '</small></a>';
                             }
                             return ret;
                         }

+ 11 - 5
routes/web.php

@@ -686,12 +686,17 @@ Route::get('/get_course_list', function(){
 
     }
 
+    $count = $member_course->count();
+
     $js = '';
     $xx = 2;
     $str = '';
-    $str .= "<a class=green><small>" . (isset($totalIsc["Y"]) ? formatPrice($totalIsc["Y"]) : 0) . "</small></a><br>";
-    $str .= "<a class=orange><small>" . (isset($totalIsc["N"]) ? formatPrice($totalIsc["N"]) : 0) . "</small></a><br>";
-    $str .= "<a class=yellow><small>0</small></a><br>";
+    if ($count > 0)
+    {
+        $str .= "<a style='width:100%;float:right; text-align:right; display:block;' class=green><small>" . (isset($totalIsc["Y"]) ? formatPrice($totalIsc["Y"]) : 0) . "</small></a><br>";
+        $str .= "<a style='width:100%;float:right; text-align:right; display:block;' class=orange><small>" . (isset($totalIsc["N"]) ? formatPrice($totalIsc["N"]) : 0) . "</small></a><br>";
+        $str .= "<a style='width:100%;float:right; text-align:right; display:block;' class=yellow><small>02220</small></a><br>";
+    }
     $js .= "2§" . $str . "_";
     $str = "";
     foreach($totals as $z => $t)
@@ -712,13 +717,13 @@ Route::get('/get_course_list', function(){
         foreach($t as $x => $c)
         {
             $y = $x == 'yellow' ? $c : formatPrice($c);
-            $str .= "<a class=" . $x . "><small>" . $y . "</small></a><br>";
+            $str .= "<a style='width:100%;float:right; text-align:right; display:block;' class=" . $x . "><small>" . $y . "</small></a><br>";
         }
         $js .= $xx . "§" . $str . "_";
         $xx += 1;
     }
 
-    $count = $member_course->count();
+    
     //$member_course = $member_course->where('course_id', 999999);
 
     $start = 0;
@@ -780,6 +785,7 @@ Route::get('/get_course_list', function(){
 
                 if ($cls == 'yellow')
                 {
+                    $prices[$i] = 0;
                     $totals[$i][$cls] += 1;
                 }
                 else

binární
storage/.DS_Store


binární
storage/framework/.DS_Store


binární
tests/.DS_Store