Luca Parisio před 1 rokem
rodič
revize
20a5391c5e

binární
.DS_Store


+ 9 - 0
app/Http/Livewire/Member.php

@@ -26,6 +26,8 @@ class Member extends Component
 
     public $type = 'dati';
 
+    public $from = '';
+
     public $selectedCourseMember = 0;
 
     protected $messages = [
@@ -419,6 +421,11 @@ class Member extends Component
             $this->add();
         }
 
+        if (isset($_GET["from"]))
+        {
+            $this->from = $_GET["from"];
+        }
+
         $this->cards = \App\Models\Card::select('id', 'name')->get();
 
         $this->disciplines = \App\Models\Discipline::select('id', 'name')->get();
@@ -749,6 +756,7 @@ class Member extends Component
 
     public function showDetailF($id)
     {
+        $this->from = 'members';
         $this->currentMember = \App\Models\Member::findOrFail($id);
         $this->currentStatus = $this->currentMember->getStatus();
         $this->showDetail = true;
@@ -909,6 +917,7 @@ class Member extends Component
 
     public function edit($id){
 
+        $this->from = 'members';
         $this->showDetail = false;
         $this->emit('setEdit', true);
         $this->emit('setEditCorso', false);

+ 66 - 0
public/medere.html

@@ -0,0 +1,66 @@
+<!doctype html>
+<head>
+<script src="https://sdk.amazonaws.com/js/aws-sdk-2.357.0.min.js"></script>
+<script type="text/javascript" src="https://code.jquery.com/jquery-3.2.1.min.js"></script>
+<script type="text/javascript">
+
+var s3 = new AWS.S3({
+        apiVersion: 'latest',
+        region: 'de',
+        endpoint: 'https://s3.de.io.cloud.ovh.net/',
+        params: {
+            Bucket: 'medere'
+        },
+        credentials: {
+            accessKeyId:'78bd8d437d004457b89b04d803ed4d9e',
+            secretAccessKey:'516669c11e974de280515fc5dedf4396'
+        }
+});
+
+</script>
+<meta name="referrer" content="same-origin" />
+</head>
+<body>
+    <!-- A functional html code-->
+    <div>
+        <input type="file" id="fileUpload">
+    </div>
+
+    <div>
+    <button onclick="s3upload()">Submit</button>
+    </div>
+
+    <progress max=”100” value=”0”></progress>
+
+    <img src="https://medere.s3.de.io.cloud.ovh.net/medere/test/sample.jpg?123">
+
+    <script type="text/javascript">
+
+      function s3upload() {  
+                var files = document.getElementById('fileUpload').files;
+                if (files) 
+                {
+                    var file = files[0];
+                    var fileName = file.name;
+                    var filePath = 'test/' + fileName;
+                    var fileUrl = 'https://s3.de.io.cloud.ovh.net/' +  filePath;
+            
+                    s3.upload({
+                        Key: filePath,
+                        Body: file,
+                        ACL: 'public-read'
+                    }, function(err, data) {
+                        if(err) {
+                            console.log('error' + err);
+                        }
+                        
+                        alert('Successfully Uploaded!');
+                    }).on('httpUploadProgress', function (progress) {
+                        var uploaded = parseInt((progress.loaded * 100) / progress.total);
+                        $("progress").attr('value', uploaded);
+                    });
+                }
+      };
+    </script>
+</body>
+</html>

+ 49 - 2
resources/views/livewire/course_list.blade.php

@@ -360,6 +360,39 @@
             //@this.search();
         }
 
+        @if(isset($_GET["showFilters"]))
+            var filterYear = localStorage.getItem("filterYearCourseList");
+            if (filterYear)
+            {
+                $('.filterYear').val(filterYear).trigger('change');
+            }        
+            var filterCourse = localStorage.getItem("filterCourseCourseList");
+            if (filterCourse)
+            {
+                $('.filterCourse').val(filterCourse).trigger('change');
+            }        
+            var filterLevel = localStorage.getItem("filterLevelCourseList");
+            if (filterLevel)
+            {
+                $('.filterLevel').val(filterLevel).trigger('change');
+            }        
+            var filterFrequency = localStorage.getItem("filterFrequencyCourseList");
+            if (filterFrequency)
+            {
+                $('.filterFrequency').val(filterFrequency).trigger('change');
+            }        
+            var filterDuration = localStorage.getItem("filterDurationCourseList");
+            if (filterDuration)
+            {
+                $('.filterDuration').val(filterDuration).trigger('change');
+            }        
+            var filterType = localStorage.getItem("filterTypeCourseList");
+            if (filterType)
+            {
+                $('.filterType').val(filterType).trigger('change');
+            }        
+        @endif
+
         function reset()
         {
             $('.filterYear').val(null).trigger("change");
@@ -370,6 +403,9 @@
             $('.filterType').val(null).trigger("change");
 
             destroyDataTable();
+
+            //localStorage.clear();
+
             loadDataTable();
         }
 
@@ -380,11 +416,22 @@
             }
 
             var filterYear = $('.filterYear').val();
+            localStorage.setItem("filterYearCourseList", filterYear);
+
             var filterCourse = $('.filterCourse').val();
+            localStorage.setItem("filterCourseCourseList", filterCourse);
+
             var filterLevel = $('.filterLevel').val();
+            localStorage.setItem("filterLevelCourseList", filterLevel);
+            
             var filterDuration = $('.filterDuration').val();
+            localStorage.setItem("filterDurationCourseList", filterDuration);
+
             var filterFrequency = $('.filterFrequency').val();
+            localStorage.setItem("filterFrequencyCourseList", filterFrequency);
+
             var filterType = $('.filterType').val();
+            localStorage.setItem("filterTypeCourseList", filterType);
 
             $('#tablesaw-350').DataTable({
                 //scrollX: true,
@@ -412,7 +459,7 @@
                     {
                         data: 'column_0',
                         render: function (data, type, row){
-                            var ret = '<a href="/members?member_detail=' + row["column_17"] + '">' + data + '</a>';
+                            var ret = '<a href="/members?member_detail=' + row["column_17"] + '&from=course_list">' + data + '</a>';
                             return ret;
                         }
                     },
@@ -420,7 +467,7 @@
                         data: 'column_1',
                         render: function (data, type, row){
                             const x = data.split("§");
-                            var ret = '<a href="/members?member_detail=' + row["column_17"] + '">' + data + '</a>';
+                            var ret = '<a href="/members?member_detail=' + row["column_17"] + '&from=course_list">' + data + '</a>';
                             return ret;
                         }
                     },

+ 134 - 5
resources/views/livewire/course_member.blade.php

@@ -232,7 +232,7 @@
                     <div class="col-12">
                         <div class="row">
                             <div class="col-3"><label class="form-check-label ms-2" >Da</label></div>
-                            <div class="col-9"><input class="form-control txt fromFromYear" type="number" name="fromFromYear" ></div>
+                            <div class="col-9"><input class="form-control txt fromFromYear" name="fromYearYear" type="number" name="fromFromYear" ></div>
                         </div>
                     </div>
                     <div class="col-12">
@@ -275,8 +275,8 @@
                     @foreach($records as $idx => $record)
                         <tr>
                             <td>{{$idx +1}}</td>
-                            <td><a href="/members?member_detail={{$record->member_id}}">{{$record->member->last_name}}</a></td>
-                            <td><a href="/members?member_detail={{$record->member_id}}">{{$record->member->first_name}}</a></td>
+                            <td><a href="/members?member_detail={{$record->member_id}}&from=course_member">{{$record->member->last_name}}</a></td>
+                            <td><a href="/members?member_detail={{$record->member_id}}&from=course_member">{{$record->member->first_name}}</a></td>
                             <td>{{$record->member->getAge()}}</td>
                             <td>{{date("Y", strtotime($record->member->birth_date))}}</td>
                             <td>{{$record->member->phone}}</td>
@@ -436,6 +436,103 @@
             $('#tablesaw-350').DataTable().destroy();
         });
 
+        @if(isset($_GET["showFilters"]))
+            var filterYear = localStorage.getItem("filterYearCourseMember");
+            if (filterYear)
+            {
+                $('.filterYear').val(filterYear).trigger('change');
+            }        
+            var filterCourse = localStorage.getItem("filterCourseCourseMember");
+            if (filterCourse)
+            {
+                $('.filterCourse').val(filterCourse).trigger('change');
+            }        
+            var filterLevel = localStorage.getItem("filterLevelCourseMember");
+            if (filterLevel)
+            {
+                $('.filterLevel').val(filterLevel).trigger('change');
+            }        
+            var filterFrequency = localStorage.getItem("filterFrequencyCourseMember");
+            if (filterFrequency)
+            {
+                $('.filterFrequency').val(filterFrequency).trigger('change');
+            }        
+            var filterDuration = localStorage.getItem("filterDurationCourseMember");
+            if (filterDuration)
+            {
+                $('.filterDuration').val(filterDuration).trigger('change');
+            }        
+            var filterType = localStorage.getItem("filterTypeCourseMember");
+            if (filterType)
+            {
+                $('.filterType').val(filterType).trigger('change');
+            }        
+
+            var filterDays = localStorage.getItem("filterDaysCourseMember");
+            if (filterDays)
+            {
+                $('.filterDays').val(filterDays).trigger('change');
+            }        
+            
+            var filterHours = localStorage.getItem("filterHoursCourseMember");
+            if (filterHours)
+            {
+                $('.filterHours').val(filterHours).trigger('change');
+            }        
+            
+            var filterStatus = localStorage.getItem("filterStatusCourseMember");
+            if (filterStatus)
+            {
+                $('.filterStatus').val(filterStatus).trigger('change');
+            }        
+
+            var filterSubscription = localStorage.getItem("filterSubscriptionCourseMember");
+            if (filterSubscription)
+            {
+                $('.filterSubscription').val(filterSubscription).trigger('change');
+            }        
+            
+            var filterCards = localStorage.getItem("filterCardsCourseMember");
+            if (filterCards)
+            {
+                $('.filterCards').val(filterCards).trigger('change');
+            }        
+
+            var filterCertificateScadenza = localStorage.getItem("filterCertificateScadenzaCourseMember");
+            if (filterCertificateScadenza)
+            {
+                $('.filterCertificateScadenza').val(filterCertificateScadenza).trigger('change');
+            }        
+            
+            var filterCertificateType = localStorage.getItem("filterCertificateTypeCourseMember");
+            if (filterCertificateType)
+            {
+                $('.filterCertificateType').val(filterCertificateType).trigger('change');
+            }        
+
+            var fromYear = localStorage.getItem("fromYearCourseMember");
+            if (fromYear)
+            {
+                $('input[name="fromYear"]').val(fromYear);
+            }
+            var toYear = localStorage.getItem("toYearCourseMember");
+            if (toYear)
+            {
+                $('input[name="toYear"]').val(toYear);
+            }
+            var fromFromYear = localStorage.getItem("fromFromYearCourseMember");
+            if (fromFromYear)
+            {
+                $('input[name="fromYearYear"]').val(fromFromYear);
+            }
+
+            var toYearYear = localStorage.getItem("toYearYearCourseMember");
+            if (toYearYear)
+            {
+                $('input[name="toToYear"]').val(toYearYear);
+            }
+        @endif        
+
         function reset()
         {
             $('.filterCourse').val(null).trigger("change");
@@ -493,23 +590,55 @@
             }
 
             var filterCourse = $('.filterCourse').val();
+            localStorage.setItem("filterCourseCourseMember", filterCourse);
+
             var filterLevel = $('.filterLevel').val();
+            localStorage.setItem("filterLevelCourseMember", filterLevel);
+
             var filterDuration = $('.filterDuration').val();
+            localStorage.setItem("filterDurationCourseMember", filterDuration);
+
             var filterFrequency = $('.filterFrequency').val();
+            localStorage.setItem("filterFrequencyCourseMember", filterFrequency);
+
             var filterType = $('.filterType').val();
+            localStorage.setItem("filterTypeCourseMember", filterType);
+
             var filterDays = $('.filterDays').val();
+            localStorage.setItem("filterDaysCourseMember", filterDays);
+
             var filterHours = $('.filterHours').val();
+            localStorage.setItem("filterHoursCourseMember", filterHours);
+
             var filterStatus = $('.filterStatus').val();
+            localStorage.setItem("filterStatusCourseMember", filterStatus);
+
             var filterSubscription = $('.filterSubscription').val();
+            localStorage.setItem("filterSubscriptionCourseMember", filterSubscription);
+            
             var filterYear = $('.filterYear').val();
+            localStorage.setItem("filterYearCourseMember", filterYear);
+
             var filterCards = $('.filterCards').val();
+            localStorage.setItem("filterCardsCourseMember", filterCards);
+
             var filterCertificateScadenza = $('.filterCertificateScadenza').val();
+            localStorage.setItem("filterCertificateScadenzaCourseMember", filterCertificateScadenza);
+
             var filterCertificateType = $('.filterCertificateType').val();
+            localStorage.setItem("filterCertificateTypeCourseMember", filterCertificateType);
 
             var fromYear = $('.fromYear').val();
+            localStorage.setItem("fromYearCourseMember", fromYear);
+
             var toYear = $('.toYear').val();
+            localStorage.setItem("toYearCourseMember", toYear);
+
             var fromFromYear = $('.fromFromYear').val();
+            localStorage.setItem("fromFromYearCourseMember", fromFromYear);
+
             var toToYear = $('.toToYear').val();
+            localStorage.setItem("toYearYearCourseMember", toToYear);
 
             $('#tablesaw-350').DataTable({
                 serverSide: true,
@@ -530,14 +659,14 @@
                     {
                         data: 'column_1',
                         render: function (data, type, row){
-                            var ret = '<a href="/members?member_detail=' + row["column_7"] + '">' + data + '</a>';
+                            var ret = '<a href="/members?member_detail=' + row["column_7"] + '&from=course_member">' + data + '</a>';
                             return ret;
                         }
                     },
                     {
                         data: 'column_2',
                         render: function (data, type, row){
-                            var ret = '<a href="/members?member_detail=' + row["column_7"] + '">' + data + '</a>';
+                            var ret = '<a href="/members?member_detail=' + row["column_7"] + '&from=course_member">' + data + '</a>';
                             return ret;
                         }
                     },

+ 79 - 4
resources/views/livewire/member.blade.php

@@ -1,6 +1,10 @@
 <div>
         @if($showDetail)
 
+        @if($from != '')
+            <a style="margin-top:20px" class="btn--ui lightGrey" href="/{{$from}}?showFilters=1"><i class="fa-solid fa-arrow-left"></i></a><br>
+        @endif
+
         <div class="col col-lg-12" style="margin-bottom:100px;">
             <div class="user--profile d-lg-flex" style="margin-top:20px !important">
                 <div class="user--profile_card d-flex justify-content-between flex-column w-100 w-lg-auto mb-3 mb-lg-0">
@@ -483,7 +487,11 @@
             @else
 
                 <a name="top"></a>
-
+                
+                @if($from != '')
+                    <a class="btn--ui lightGrey" href="/{{$from}}?showFilters=1"><i class="fa-solid fa-arrow-left"></i></a><br>
+                @endif
+                
                 @if (session()->has('success'))
                     <div class="alert alert-success" role="alert">
                         {{ session()->get('success') }}
@@ -2161,6 +2169,57 @@
         $('.filterCertificateType').select2();
         $('.filterCategories').select2();
 
+        @if(isset($_GET["showFilters"]))
+            var filterStatus = localStorage.getItem("filterStatusMember");
+            if (filterStatus)
+            {
+                $('.filterStatus').val(filterStatus).trigger('change');
+            }
+            var filterCards = localStorage.getItem("filterCardsMember");
+            if (filterCards)
+            {
+                $('.filterCards').val(filterCards).trigger('change');
+            }
+            var filterScadenza = localStorage.getItem("filterScadenzaMember");
+            if (filterScadenza)
+            {
+                $('.filterScadenza').val(filterScadenza).trigger('change');
+            }
+            var filterCertificateType = localStorage.getItem("filterCertificateTypeMember");
+            if (filterCertificateType)
+            {
+                $('.filterCertificateType').val(filterCertificateType).trigger('change');
+            }
+            var filterCategories = localStorage.getItem("filterCategoriesMember");
+            if (filterCategories)
+            {
+                $('.filterCategories').val(filterCategories).trigger('change');
+            }
+            var fromYear = localStorage.getItem("fromYearMember");
+            if (fromYear)
+            {
+                $('input[name="txtFromYear"]').val(fromYear);
+            }
+            var toYear = localStorage.getItem("toYearMember");
+            if (toYear)
+            {
+                $('input[name="txtToYear"]').val(toYear);
+            }
+            var fromYearYear = localStorage.getItem("fromYearYearMember");
+            if (fromYearYear)
+            {
+                $('input[name="txtFromYearYear"]').val(fromYearYear);
+            }
+
+            var toYearYear = localStorage.getItem("toYearYearMember");
+            if (toYearYear)
+            {
+                $('input[name="txtToYearYear"]').val(toYearYear);
+            }
+        
+        @endif
+
+
         $(document).on("keypress", $('.filterCategories'), function (e) {
 
             setTimeout(() => {
@@ -2186,9 +2245,9 @@
         {
             $('.filterCards').val('').trigger('change');
             $('.filterStatus').val('').trigger('change');
-            $('.filterScadenza').val('').trigger('change');
-            $('.filterCertificateType').val('').trigger('change');
-            $('.filterCategories').val('').trigger('change');
+            $('.filterScadenza').val('-1').trigger('change');
+            $('.filterCertificateType').val('-1').trigger('change');
+            $('.filterCategories').val('-1').trigger('change');
 
             /*
             $(".chkCertificateNormal").prop( "checked", false );
@@ -2203,6 +2262,7 @@
             $('input[name="txtFromYearYear"]').val('');
             $('input[name="txtToYearYear"]').val('');
 
+            //localStorage.clear();
 
             loadDataTable();
         }
@@ -2225,16 +2285,31 @@
             //var status2 = $('input[name="chkStatus2"]:checked').val();
 
             var fromYear = $('input[name="txtFromYear"]').val();
+            localStorage.setItem("fromYearMember", fromYear);
+            
             var toYear = $('input[name="txtToYear"]').val();
+            localStorage.setItem("toYearMember", toYear);
 
             var fromYearYear = $('input[name="txtFromYearYear"]').val();
+            localStorage.setItem("fromYearYearMember", fromYearYear);
+
             var toYearYear = $('input[name="txtToYearYear"]').val();
+            localStorage.setItem("toYearYearMember", toYearYear);
 
             var filterCards = $('.filterCards').val();
+            localStorage.setItem("filterCardsMember", filterCards);
+
             var filterStatus = $('.filterStatus').val();
+            localStorage.setItem("filterStatusMember", filterStatus);
+            
             var filterScadenza = $('.filterScadenza').val();
+            localStorage.setItem("filterScadenzaMember", filterScadenza);
+            
             var filterCertificateType = $('.filterCertificateType').val();
+            localStorage.setItem("filterCertificateTypeMember", filterCertificateType);
+            
             var filterCategories = $('.filterCategories').val();
+            localStorage.setItem("filterCategoriesMember", filterCategories);
 
             $('#tablesaw-350').DataTable({
                 //destroy: true,

+ 2 - 2
routes/web.php

@@ -376,12 +376,12 @@ Route::group(['middleware' => 'auth'],function(){
             if ($_GET["filterCommercial"] == 1)
             {
                 $x = $x->where('commercial', true );
-                $y = $y->where('commercial', true );
+                $y = $y->where('records.commercial', true );
             }
             if ($_GET["filterCommercial"] == 2)
             {
                 $x = $x->where('commercial', false);
-                $y = $y->where('commercial', false);
+                $y = $y->where('records.commercial', false);
             }
             if ($_GET["filterMember"] > 0)
             {