Merge branch 'issue-7' of krzysiej/paper-pi into master

app/Http/Controllers/Main.php

@@ -160,17 +160,20 @@ class Main extends Controller
 
     /**
      * post::/print/{id}
+     * @param Request $request
      * @param $id
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function printText($id)
+    public function printText(Request $request, $id)
     {
         $note = DB::table('note')->where('id', $id)->first();
         $this->paper->sendPrint($note->topic, $note->text, $note->icon);
+        $request->session()->flash('print_status', 'Wydrukowano notatkę: ' . $note->topic . '!');
         return back();
     }
 
-    private function templateReplace($input){
+    private function templateReplace($input)
+    {
 
         return str_replace(['[d]', '[m]', '[y]', '[h]', '[i]', '[s]'],
             [date('d'), date('m'), date('Y'), date('H'), date('i'), date('s')],
@@ -273,6 +276,7 @@ class Main extends Controller
             return redirect()->route('edit', ['id' => $note->id, 'slug' => $note->topic_slug]);
         } else {
             $this->paper->sendPrint($request->input('title'), $request->input('text'), $request->input('icon'));
+            $request->session()->flash('print_status', 'Wydrukowano szybką notatkę: ' . (strlen($request->input('title')) ? $request->input('title') : substr($request->input('text'), 0, 20)) . '!');
             return back()->withInput();
         }
 

app/Http/Controllers/Repertoire.php

@@ -7,6 +7,7 @@ use App\Paper\CinemaGdynskieCentrumFilmowe;
 use App\Paper\CinemaHelios;
 use App\Paper\CinemaMultikino;
 use App\Paper\Paper;
+use Illuminate\Http\Request;
 
 class Repertoire extends Controller
 {
@@ -20,31 +21,35 @@ class Repertoire extends Controller
     }
 
 
-    public function today_cinemacity()
+    public function today_cinemacity(Request $request)
     {
         $cinemacity = new CinemaCinemaCity();
         $cinemacity->setCinemaId(1010912);
         $cinemacity->setDay(date('Y-m-d'));
         $repertuarText = $cinemacity->convertToPrint();
 
-        $this->main->sendPrint('', $repertuarText, $this->icon);
+        $this->main->sendPrintnt('', $repertuarText, $this->icon);
+        $request->session()->flash('print_status', 'Wydrukowano repertuar CinemaCity na dzisiaj!');
+
         return back();
     }
 
 
-    public function tomorrow_cinemacity()
+    public function tomorrow_cinemacity(Request $request)
     {
         $cinemacity = new CinemaCinemaCity();
         $cinemacity->setCinemaId(1010912);
         $cinemacity->setDay(date_create()->modify('+1 day')->format('Y-m-d'));
         $repertuarText = $cinemacity->convertToPrint();
 
-        $this->main->sendPrint('', $repertuarText, $this->icon);
+        $this->main->sendPrintnt('', $repertuarText, $this->icon);
+        $request->session()->flash('print_status', 'Wydrukowano repertuar CinemaCity na jutro!');
+
         return back();
     }
 
 
-    public function today_multikino()
+    public function today_multikino(Request $request)
     {
         $multikino = new CinemaMultikino();
 
@@ -52,43 +57,51 @@ class Repertoire extends Controller
         $multikino->setDay(date('Y-m-d'));
 
         $repertuarText = $multikino->convertToPrint();
-        $this->main->sendPrint('', $repertuarText, $this->icon);
+        $this->main->sendPrintnt('', $repertuarText, $this->icon);
+        $request->session()->flash('print_status', 'Wydrukowano repertuar Multikina na dzisiaj!');
+
         return back();
     }
 
-    public function tomorrow_multikino()
+    public function tomorrow_multikino(Request $request)
     {
         $multikino = new CinemaMultikino();
         $multikino->setDay(date_create()->modify('+1 day')->format('Y-m-d'));
         $multikino->setCinemaId(4);
 
         $repertuarText = $multikino->convertToPrint();
-        $this->main->sendPrint('', $repertuarText, $this->icon);
+        $this->main->sendPrintnt('', $repertuarText, $this->icon);
+        $request->session()->flash('print_status', 'Wydrukowano repertuar Multikina na jutro!');
+
         return back();
     }
 
 
-    public function tomorrow_gdynskiecentrumfilmowe()
+    public function tomorrow_gdynskiecentrumfilmowe(Request $request)
     {
         $gdynskieCentrumFilmowe = new CinemaGdynskieCentrumFilmowe();
         $gdynskieCentrumFilmowe->setDay(date_create()->modify('+1 day')->format('d_m_Y'));
         $repertuarText = $gdynskieCentrumFilmowe->convertToPrint();
 
-        $this->main->sendPrint('', $repertuarText, $this->icon);
+        $this->main->sendPrintnt('', $repertuarText, $this->icon);
+        $request->session()->flash('print_status', 'Wydrukowano repertuar Gdyńskiego Centrum Filmowego na jutro!');
+
         return back();
     }
 
-    public function today_gdynskiecentrumfilmowe()
+    public function today_gdynskiecentrumfilmowe(Request $request)
     {
         $gdynskieCentrumFilmowe = new CinemaGdynskieCentrumFilmowe();
         $gdynskieCentrumFilmowe->setDay(date('d_m_y'));
         $repertuarText = $gdynskieCentrumFilmowe->convertToPrint();
 
-        $this->main->sendPrint('', $repertuarText, $this->icon);
+        $this->main->sendPrintnt('', $repertuarText, $this->icon);
+        $request->session()->flash('print_status', 'Wydrukowano repertuar Gdyńskiego Centrum Filmowego na jutro!');
+
         return back();
     }
 
-    public function today_helios()
+    public function today_helios(Request $request)
     {
         $helios = new CinemaHelios();
         $helios->setDay(0);
@@ -96,12 +109,12 @@ class Repertoire extends Controller
         $helios->convertToPrint();
 
         $repertuarText = $helios->convertToPrint();
-        $this->main->sendPrint('', $repertuarText, $this->icon);
+        $this->main->sendPrintnt('', $repertuarText, $this->icon);
-
+        $request->session()->flash('print_status', 'Wydrukowano repertuar Helios na dzisiaj!');
         return back();
     }
 
-    public function tomorrow_helios()
+    public function tomorrow_helios(Request $request)
     {
         $helios = new CinemaHelios();
         $helios->setDay(1);
@@ -109,25 +122,29 @@ class Repertoire extends Controller
         $helios->convertToPrint();
 
         $repertuarText = $helios->convertToPrint();
-        $this->main->sendPrint('', $repertuarText, $this->icon);
+        $this->main->sendPrintnt('', $repertuarText, $this->icon);
-
+        $request->session()->flash('print_status', 'Wydrukowano repertuar Helios na jutro!');
         return back();
     }
 
-    public function today_repertoire()
+    public function today_repertoire(Request $request)
     {
-        $this->today_multikino();
+        $this->today_multikino($request);
-        $this->today_cinemacity();
+        $this->today_cinemacity($request);
-        $this->today_helios();
+        $this->today_helios($request);
-        $this->today_gdynskiecentrumfilmowe();
+        $this->today_gdynskiecentrumfilmowe($request);
+        $request->session()->flash('print_status', 'Wydrukowano repertuar Heliosa, Multikina, CinemaCity i Gdyńskiego Centrum Filmowego na dzisiaj!');
+        return back();
     }
 
-    public function tomorrow_repertoire()
+    public function tomorrow_repertoire(Request $request)
     {
-        $this->tomorrow_multikino();
+        $this->tomorrow_multikino($request);
-        $this->tomorrow_cinemacity();
+        $this->tomorrow_cinemacity($request);
-        $this->tomorrow_helios();
+        $this->tomorrow_helios($request);
-        $this->tomorrow_gdynskiecentrumfilmowe();
+        $this->tomorrow_gdynskiecentrumfilmowe($request);
+        $request->session()->flash('print_status', 'Wydrukowano repertuar Heliosa, Multikina, CinemaCity i Gdyńskiego Centrum Filmowego na jutro!');
+        return back();
     }
 
 }

app/Paper/Paper.php

@@ -12,7 +12,6 @@ use Mockery\Exception;
 class Paper
 {
     private $imageDirectory = 'large/';
-    private $imageDirectorySmall = 'small/';
 
 
     private $printer;
@@ -71,7 +70,7 @@ class Paper
         $htmlToPos = new HtmlToPos();
         $this->printer->text($htmlToPos->convert($text));
 
-        $this->printer->feed(4);
+        $this->printer->feed(3);
     }
 
     /**
@@ -84,8 +83,6 @@ class Paper
      */
     public function getIcons()
     {
-//        $icons = array_diff(scandir($this->imageDirectorySmall), ['.', '..']);
-
         $icons = ["address-card-o","anchor","archive-3","at","balance-scale","ban","bar-chart-o","barcode","battery-empty","battery-full","battery-half","battery-quarter","battery-three-quarters","bed","beer","bell-o","bell-slash-o","bicycle","birthday-cake","bolt","bomb","book","bug","building-o","bullhorn","bus","camera","car","chain","chat-2","check","cloud","code","coffee","cog","cutlery","dashboard","database","diamond","dollar","dribbble","envelope-o","envira","exclamation-triangle","female","file-text-o","film","fingerprint","fire-extinguisher","fire","flag-o","flask","floppy-o","folder-o","folder-open-o","frown-o","gamepad","gift","git","glass","graduation-cap","grav","group","hand-o-left","heart-o","home","lemon-o","lightbulb-o","list-alt","location-arrow","lock","male","map-1","map-marker","microchip","money","moon-o","music","paper-plane","paperclip","paw","pencil","phone","pie-chart","piggy-bank","plane","question-circle-o","rocket","search","ship","shopping-cart","smile-o","snowflake-o","steam","subway","success","support","thermometer-2","thumbs-o-down","thumbs-o-up","ticket","times","trash-o","tree","trophy","truck","umbrella","usd","warning","wifi","wpexplorer","wrench","youtube-play"];
 
 

resources/views/list.blade.php

@@ -4,6 +4,14 @@
 
 @section('content')
     <div class="ui container">
+        @if(Session::has('print_status'))
+            <div class="ui info message">
+                <div class="header">
+                    {{  Session::get('print_status') }}
+                </div>
+            </div>
+        @endif
+
         <h1 class="ui header">Szybka notatka</h1>
 
         <div class="ui container">