From 41815b9af62b40997505f8a5bbb0299a403e6d32 Mon Sep 17 00:00:00 2001 From: srivastava-jyoti Date: Tue, 17 Sep 2024 13:23:13 +0530 Subject: [PATCH 01/16] crecated table --- ...ate_library_book_location_copies_table.php | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 database/migrations/2024_09_17_125527_create_library_book_location_copies_table.php diff --git a/database/migrations/2024_09_17_125527_create_library_book_location_copies_table.php b/database/migrations/2024_09_17_125527_create_library_book_location_copies_table.php new file mode 100644 index 0000000000..ed76116d08 --- /dev/null +++ b/database/migrations/2024_09_17_125527_create_library_book_location_copies_table.php @@ -0,0 +1,39 @@ +id(); + $table->unsignedInteger('book_id'); + $table->unsignedBigInteger('office_location_id'); + $table->integer('number_of_copies'); + $table->timestamps(); + }); + + Schema::table('library_book_location', function (Blueprint $table) { + $table->foreign('book_id')->references('id')->on('library_books'); + $table->foreign('office_location_id')->references('id')->on('office_locations'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('library_book_location'); + } +} From 30f061c8ba9a028df1a345b009a6f50c8645400b Mon Sep 17 00:00:00 2001 From: srivastava-jyoti Date: Tue, 17 Sep 2024 13:51:42 +0530 Subject: [PATCH 02/16] created model --- .../Operations/Entities/OfficeLocation.php | 6 +++++ app/Models/KnowledgeCafe/Library/Book.php | 6 +++++ .../KnowledgeCafe/Library/BookLocation.php | 26 +++++++++++++++++++ 3 files changed, 38 insertions(+) create mode 100644 app/Models/KnowledgeCafe/Library/BookLocation.php diff --git a/Modules/Operations/Entities/OfficeLocation.php b/Modules/Operations/Entities/OfficeLocation.php index 52ee7b704b..10a625847d 100644 --- a/Modules/Operations/Entities/OfficeLocation.php +++ b/Modules/Operations/Entities/OfficeLocation.php @@ -2,6 +2,7 @@ namespace Modules\Operations\Entities; +use App\Models\KnowledgeCafe\Library\BookLocation; use Illuminate\Database\Eloquent\Model; use Modules\User\Entities\User; @@ -13,4 +14,9 @@ public function centreHead() { return $this->belongsTo(User::class, 'centre_head_id'); } + + public function locationOfBook() + { + return $this->hasMany(BookLocation::class, 'office_loaction_id'); + } } diff --git a/app/Models/KnowledgeCafe/Library/Book.php b/app/Models/KnowledgeCafe/Library/Book.php index 6fc510e7d2..85181bcc24 100644 --- a/app/Models/KnowledgeCafe/Library/Book.php +++ b/app/Models/KnowledgeCafe/Library/Book.php @@ -6,6 +6,7 @@ use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\SoftDeletes; use Modules\User\Entities\User; +use App\Models\KnowledgeCafe\Library\BookLocation; class Book extends Model { @@ -174,4 +175,9 @@ public function bookAMonths() { return $this->hasMany(BookAMonth::class, 'library_book_id'); } + + public function bookLocations() + { + return $this->hasMany(BookLocation::class, 'book_id'); + } } diff --git a/app/Models/KnowledgeCafe/Library/BookLocation.php b/app/Models/KnowledgeCafe/Library/BookLocation.php new file mode 100644 index 0000000000..3ee47579f5 --- /dev/null +++ b/app/Models/KnowledgeCafe/Library/BookLocation.php @@ -0,0 +1,26 @@ +hasOne(Book::class, 'id', 'book_id'); + } + + public function location() + { + return $this->hasOne(OfficeLocation::class, 'id', 'office_loaction_id'); + } +} \ No newline at end of file From 5fba0814526e2fc7e97bed0c2e8c517900d0386d Mon Sep 17 00:00:00 2001 From: srivastava-jyoti Date: Sat, 21 Sep 2024 13:47:23 +0530 Subject: [PATCH 03/16] wip --- .../KnowledgeCafe/Library/BookController.php | 31 +++++++++++++++++-- resources/js/app.js | 3 ++ .../library/books/info.blade.php | 20 +++++++++--- 3 files changed, 47 insertions(+), 7 deletions(-) diff --git a/app/Http/Controllers/KnowledgeCafe/Library/BookController.php b/app/Http/Controllers/KnowledgeCafe/Library/BookController.php index 7760eb619d..536baa091b 100644 --- a/app/Http/Controllers/KnowledgeCafe/Library/BookController.php +++ b/app/Http/Controllers/KnowledgeCafe/Library/BookController.php @@ -7,6 +7,8 @@ use App\Models\KnowledgeCafe\Library\Book; use App\Models\KnowledgeCafe\Library\BookAMonth; use App\Models\KnowledgeCafe\Library\BookCategory; +use App\Models\KnowledgeCafe\Library\BookLocation; +use Modules\Operations\Entities\OfficeLocation; use App\Services\BookServices; use Carbon\Carbon; use Illuminate\Http\Request; @@ -59,9 +61,19 @@ public function index(Request $request) */ public function create() { - return view('knowledgecafe.library.books.create'); + $officeLocations = OfficeLocation::all(); + $officeLocationsData = $officeLocations->map(function ($officeLocation) { + return [ + 'center_id' => $officeLocation->id, + 'centre_name' => $officeLocation->centre_name, + ]; + }); + return view('knowledgecafe.library.books.create', [ + 'officeLocations' => $officeLocationsData, + ]); } + /** * Store a newly created resource in storage. * @@ -72,7 +84,6 @@ public function store(BookRequest $request) $validatedData = $request->validated(); $ISBN = $validatedData['isbn'] ?? null; Book::firstOrCreate(['isbn' => $ISBN], $validatedData); - return response()->json(['error' => false]); } @@ -342,4 +353,20 @@ public function bookAMonthIndex() 'booksBorrowedCount' => $booksBorrowedCount, ]); } + + public function storeBookLocationWise() + { + $locationCopiesData = [ + 1 => "7", + 2 => "8" + ]; + + foreach ($locationCopiesData as $locationId => $copies) { + BookLocation::create([ + 'book_id' => 1, + 'office_location_id' => $locationId, + 'number_of_copies' => $copies + ]); + } + } } diff --git a/resources/js/app.js b/resources/js/app.js index a7fb6212b1..89a670443c 100644 --- a/resources/js/app.js +++ b/resources/js/app.js @@ -748,6 +748,8 @@ if (document.getElementById("show_and_save_book")) { addMethod: "from_isbn", showInfo: false, book: {}, + copies: {}, + // officeLocations: @json($officeLocations), number_of_copies: 1, routes: { index: document.getElementById("show_book").dataset.indexRoute || "", @@ -806,6 +808,7 @@ if (document.getElementById("show_and_save_book")) { }, saveBookToRecords: function() { + console.log(this.copies, "officeLocations"); if (!this.book) { alert("Error in saving records"); } diff --git a/resources/views/knowledgecafe/library/books/info.blade.php b/resources/views/knowledgecafe/library/books/info.blade.php index 20ab849f1c..22a7f032a1 100644 --- a/resources/views/knowledgecafe/library/books/info.blade.php +++ b/resources/views/knowledgecafe/library/books/info.blade.php @@ -4,7 +4,7 @@ @{{ book.title }}
-
+
@@ -42,13 +42,23 @@
-
- -
+ @if($officeLocations) + @foreach ($officeLocations as $officeLocation) +
+ {{ $officeLocation['centre_name'] }} + + +
+ @endforeach + @endif
-
+
From 1ccf77dea572ac7e371db364f70f343f4c20cc33 Mon Sep 17 00:00:00 2001 From: srivastava-jyoti Date: Sat, 21 Sep 2024 17:31:03 +0530 Subject: [PATCH 04/16] wip --- Modules/Operations/Entities/OfficeLocation.php | 2 +- .../KnowledgeCafe/Library/BookController.php | 4 ++-- app/Models/KnowledgeCafe/Library/BookLocation.php | 2 +- .../views/knowledgecafe/library/books/index.blade.php | 11 ++++++++++- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/Modules/Operations/Entities/OfficeLocation.php b/Modules/Operations/Entities/OfficeLocation.php index 10a625847d..501999b40d 100644 --- a/Modules/Operations/Entities/OfficeLocation.php +++ b/Modules/Operations/Entities/OfficeLocation.php @@ -17,6 +17,6 @@ public function centreHead() public function locationOfBook() { - return $this->hasMany(BookLocation::class, 'office_loaction_id'); + return $this->hasMany(BookLocation::class, 'office_location_id'); } } diff --git a/app/Http/Controllers/KnowledgeCafe/Library/BookController.php b/app/Http/Controllers/KnowledgeCafe/Library/BookController.php index 536baa091b..c47040af87 100644 --- a/app/Http/Controllers/KnowledgeCafe/Library/BookController.php +++ b/app/Http/Controllers/KnowledgeCafe/Library/BookController.php @@ -31,7 +31,7 @@ public function index(Request $request) $searchCategory = $request->category_name ?? false; $searchString = request()->has('search') ? request()->input('search') : false; $categories = BookCategory::orderBy('name')->get(); - + $bookLocations = BookLocation::withTrashed()->with('location')->get(); switch (request()) { case request()->has('wishlist'): $books = auth()->user()->booksInWishlist; @@ -51,7 +51,7 @@ public function index(Request $request) $wishlistedBooksCount = auth()->user()->booksInWishlist->count(); $booksBorrowedCount = auth()->user()->booksBorrower->count(); - return view('knowledgecafe.library.books.index', compact('books', 'loggedInUser', 'categories', 'wishlistedBooksCount', 'booksBorrowedCount')); + return view('knowledgecafe.library.books.index', compact('books', 'loggedInUser', 'categories', 'wishlistedBooksCount', 'booksBorrowedCount', 'bookLocations')); } /** diff --git a/app/Models/KnowledgeCafe/Library/BookLocation.php b/app/Models/KnowledgeCafe/Library/BookLocation.php index 3ee47579f5..01425c254a 100644 --- a/app/Models/KnowledgeCafe/Library/BookLocation.php +++ b/app/Models/KnowledgeCafe/Library/BookLocation.php @@ -21,6 +21,6 @@ public function book() public function location() { - return $this->hasOne(OfficeLocation::class, 'id', 'office_loaction_id'); + return $this->hasOne(OfficeLocation::class, 'id', 'office_location_id'); } } \ No newline at end of file diff --git a/resources/views/knowledgecafe/library/books/index.blade.php b/resources/views/knowledgecafe/library/books/index.blade.php index cf52da129d..0007a7ccd3 100644 --- a/resources/views/knowledgecafe/library/books/index.blade.php +++ b/resources/views/knowledgecafe/library/books/index.blade.php @@ -5,7 +5,7 @@ Loading...
-
+
@include('status', ['errors' => $errors->all()])
@@ -101,6 +101,15 @@
+
+ @foreach ($bookLocations as $bookLocation) +
+ @if($bookLocation->number_of_copies!==0 ) + {{($bookLocation->location->centre_name)}}: {{$bookLocation->number_of_copies}} + @endif +
+ @endforeach +

Read by

From d7d5d7db0ba4b485a72dc24bfea09c813ca81a31 Mon Sep 17 00:00:00 2001 From: srivastava-jyoti Date: Wed, 2 Oct 2024 14:24:35 +0530 Subject: [PATCH 05/16] added copies --- .../KnowledgeCafe/Library/BookController.php | 19 ++++++++++--------- .../KnowledgeCafe/Library/BookRequest.php | 1 + resources/js/app.js | 4 +--- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/app/Http/Controllers/KnowledgeCafe/Library/BookController.php b/app/Http/Controllers/KnowledgeCafe/Library/BookController.php index c47040af87..f61b2d80bb 100644 --- a/app/Http/Controllers/KnowledgeCafe/Library/BookController.php +++ b/app/Http/Controllers/KnowledgeCafe/Library/BookController.php @@ -83,8 +83,13 @@ public function store(BookRequest $request) { $validatedData = $request->validated(); $ISBN = $validatedData['isbn'] ?? null; - Book::firstOrCreate(['isbn' => $ISBN], $validatedData); - return response()->json(['error' => false]); + $copiesLocation = $validatedData['copies']; + $book = Book::firstOrCreate(['isbn' => $ISBN], $validatedData); + $this->storeBookLocationWise($book->id, $copiesLocation); + return response()->json([ + 'error' => false, + 'book_id' => $book->id + ]); } /** @@ -354,16 +359,12 @@ public function bookAMonthIndex() ]); } - public function storeBookLocationWise() + public function storeBookLocationWise($bookId, $copiesLocation) { - $locationCopiesData = [ - 1 => "7", - 2 => "8" - ]; - + $locationCopiesData = $copiesLocation; foreach ($locationCopiesData as $locationId => $copies) { BookLocation::create([ - 'book_id' => 1, + 'book_id' => $bookId, 'office_location_id' => $locationId, 'number_of_copies' => $copies ]); diff --git a/app/Http/Requests/KnowledgeCafe/Library/BookRequest.php b/app/Http/Requests/KnowledgeCafe/Library/BookRequest.php index 9a619bb066..7c203ef3d2 100644 --- a/app/Http/Requests/KnowledgeCafe/Library/BookRequest.php +++ b/app/Http/Requests/KnowledgeCafe/Library/BookRequest.php @@ -34,6 +34,7 @@ public function rules() 'self_link' => 'nullable|string', 'number_of_copies' => 'nullable|integer|gte:1', 'on_kindle' => 'nullable', + 'copies' => 'nullable', ]; } } diff --git a/resources/js/app.js b/resources/js/app.js index 89a670443c..b36eb005ff 100644 --- a/resources/js/app.js +++ b/resources/js/app.js @@ -749,8 +749,6 @@ if (document.getElementById("show_and_save_book")) { showInfo: false, book: {}, copies: {}, - // officeLocations: @json($officeLocations), - number_of_copies: 1, routes: { index: document.getElementById("show_book").dataset.indexRoute || "", fetch: document.getElementById("book_form").dataset.actionRoute || "", @@ -808,7 +806,6 @@ if (document.getElementById("show_and_save_book")) { }, saveBookToRecords: function() { - console.log(this.copies, "officeLocations"); if (!this.book) { alert("Error in saving records"); } @@ -817,6 +814,7 @@ if (document.getElementById("show_and_save_book")) { this.book["on_kindle"] = document.getElementById("on_kindle").checked ? 1 : 0; + this.book.copies = this.copies; axios.post(this.routes.store, this.book).then((response) => { this.buttons.disableSaveButton = false; From dfdd162b402ec55996456ad2f260233d95ff3716 Mon Sep 17 00:00:00 2001 From: srivastava-jyoti Date: Wed, 2 Oct 2024 15:33:37 +0530 Subject: [PATCH 06/16] wip --- resources/views/knowledgecafe/library/books/index.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/knowledgecafe/library/books/index.blade.php b/resources/views/knowledgecafe/library/books/index.blade.php index 0007a7ccd3..32de3f102f 100644 --- a/resources/views/knowledgecafe/library/books/index.blade.php +++ b/resources/views/knowledgecafe/library/books/index.blade.php @@ -57,7 +57,7 @@ @endif
-
+
From 33db6cf76cf39880155c502ed6affacb18dc334c Mon Sep 17 00:00:00 2001 From: srivastava-jyoti Date: Thu, 3 Oct 2024 18:02:36 +0530 Subject: [PATCH 07/16] wip --- .../KnowledgeCafe/Library/BookController.php | 24 ++++++++++++------- .../library/books/index.blade.php | 13 +++++++++- 2 files changed, 27 insertions(+), 10 deletions(-) diff --git a/app/Http/Controllers/KnowledgeCafe/Library/BookController.php b/app/Http/Controllers/KnowledgeCafe/Library/BookController.php index f61b2d80bb..9d62d3f84b 100644 --- a/app/Http/Controllers/KnowledgeCafe/Library/BookController.php +++ b/app/Http/Controllers/KnowledgeCafe/Library/BookController.php @@ -50,8 +50,9 @@ public function index(Request $request) $books->load('borrowers'); $wishlistedBooksCount = auth()->user()->booksInWishlist->count(); $booksBorrowedCount = auth()->user()->booksBorrower->count(); + $officeLocations = $this->officeLocationData(); - return view('knowledgecafe.library.books.index', compact('books', 'loggedInUser', 'categories', 'wishlistedBooksCount', 'booksBorrowedCount', 'bookLocations')); + return view('knowledgecafe.library.books.index', compact('books', 'loggedInUser', 'categories', 'wishlistedBooksCount', 'booksBorrowedCount', 'bookLocations', 'officeLocations')); } /** @@ -61,15 +62,8 @@ public function index(Request $request) */ public function create() { - $officeLocations = OfficeLocation::all(); - $officeLocationsData = $officeLocations->map(function ($officeLocation) { - return [ - 'center_id' => $officeLocation->id, - 'centre_name' => $officeLocation->centre_name, - ]; - }); return view('knowledgecafe.library.books.create', [ - 'officeLocations' => $officeLocationsData, + 'officeLocations' => $this->officeLocationData(), ]); } @@ -370,4 +364,16 @@ public function storeBookLocationWise($bookId, $copiesLocation) ]); } } + + public function officeLocationData() + { + $officeLocations = OfficeLocation::all(); + $officeLocationsData = $officeLocations->map(function ($officeLocation) { + return [ + 'center_id' => $officeLocation->id, + 'centre_name' => $officeLocation->centre_name, + ]; + }); + return $officeLocationsData; + } } diff --git a/resources/views/knowledgecafe/library/books/index.blade.php b/resources/views/knowledgecafe/library/books/index.blade.php index 32de3f102f..6128b41549 100644 --- a/resources/views/knowledgecafe/library/books/index.blade.php +++ b/resources/views/knowledgecafe/library/books/index.blade.php @@ -93,7 +93,18 @@
-
Number of copies of this book:
+ {{--
Number of copies of this book:
--}} +
+ @if($officeLocations) + @foreach ($bookLocations as $bookLocation) +
+ @if($bookLocation->number_of_copies!==0 ) + {{($bookLocation->location->centre_name)}}: + @endif +
+ @endforeach + @endif +
From 9d4f77e18b0ef0319f57d068ae2eb2ebbda06994 Mon Sep 17 00:00:00 2001 From: srivastava-jyoti Date: Mon, 7 Oct 2024 15:37:36 +0530 Subject: [PATCH 08/16] updated copies --- .../KnowledgeCafe/Library/BookController.php | 17 +++++++++++++++++ .../knowledgecafe/library/books/index.blade.php | 6 +++--- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/KnowledgeCafe/Library/BookController.php b/app/Http/Controllers/KnowledgeCafe/Library/BookController.php index 9d62d3f84b..5737c30cb1 100644 --- a/app/Http/Controllers/KnowledgeCafe/Library/BookController.php +++ b/app/Http/Controllers/KnowledgeCafe/Library/BookController.php @@ -3,6 +3,7 @@ namespace App\Http\Controllers\KnowledgeCafe\Library; use App\Http\Controllers\Controller; +use Illuminate\Support\Facades\DB; use App\Http\Requests\KnowledgeCafe\Library\BookRequest; use App\Models\KnowledgeCafe\Library\Book; use App\Models\KnowledgeCafe\Library\BookAMonth; @@ -120,6 +121,13 @@ public function update(BookRequest $request, Book $book) $book->number_of_copies = $validatedData['number_of_copies']; $book->save(); + $copiesLocation = [ + 1 => '8', + 2 => '3', + 3 => '10', + ]; + $this->updatedBookLocationWise($book->id, $copiesLocation); + return response()->json(['isUpdated' => $book]); } if (isset($validatedData['categories'])) { @@ -376,4 +384,13 @@ public function officeLocationData() }); return $officeLocationsData; } + + public function updatedBookLocationWise($bookId, $copiesLocation) { + foreach ($copiesLocation as $locationId => $copies) { + DB::table('library_book_location') + ->where('book_id', $bookId) // Correct column for book ID + ->where('office_location_id', $locationId) // Correct column for location ID + ->update(['number_of_copies' => $copies]); // Update with the correct data array + } + } } diff --git a/resources/views/knowledgecafe/library/books/index.blade.php b/resources/views/knowledgecafe/library/books/index.blade.php index 6128b41549..8e2c8a0375 100644 --- a/resources/views/knowledgecafe/library/books/index.blade.php +++ b/resources/views/knowledgecafe/library/books/index.blade.php @@ -93,8 +93,8 @@
- {{--
Number of copies of this book:
--}} -
+
Number of copies of this book:
+ {{--
@if($officeLocations) @foreach ($bookLocations as $bookLocation)
@@ -104,7 +104,7 @@
@endforeach @endif -
+
--}}
From 261bb11076f7aae525ba7e4f52fe6652cd8b7c22 Mon Sep 17 00:00:00 2001 From: srivastava-jyoti Date: Mon, 7 Oct 2024 17:53:48 +0530 Subject: [PATCH 09/16] wip --- .../KnowledgeCafe/Library/BookController.php | 17 +++++------------ resources/js/app.js | 17 +++++------------ .../library/books/index.blade.php | 18 ++++++++++++++---- 3 files changed, 24 insertions(+), 28 deletions(-) diff --git a/app/Http/Controllers/KnowledgeCafe/Library/BookController.php b/app/Http/Controllers/KnowledgeCafe/Library/BookController.php index 5737c30cb1..f825f2cfa0 100644 --- a/app/Http/Controllers/KnowledgeCafe/Library/BookController.php +++ b/app/Http/Controllers/KnowledgeCafe/Library/BookController.php @@ -117,17 +117,10 @@ public function show(Book $book) public function update(BookRequest $request, Book $book) { $validatedData = $request->validated(); - if (isset($validatedData['number_of_copies'])) { - $book->number_of_copies = $validatedData['number_of_copies']; + if (isset($validatedData['copies'])) { + $copiesLocation = $request['copies']; $book->save(); - - $copiesLocation = [ - 1 => '8', - 2 => '3', - 3 => '10', - ]; $this->updatedBookLocationWise($book->id, $copiesLocation); - return response()->json(['isUpdated' => $book]); } if (isset($validatedData['categories'])) { @@ -388,9 +381,9 @@ public function officeLocationData() public function updatedBookLocationWise($bookId, $copiesLocation) { foreach ($copiesLocation as $locationId => $copies) { DB::table('library_book_location') - ->where('book_id', $bookId) // Correct column for book ID - ->where('office_location_id', $locationId) // Correct column for location ID - ->update(['number_of_copies' => $copies]); // Update with the correct data array + ->where('book_id', $bookId) + ->where('office_location_id', $locationId) + ->update(['number_of_copies' => $copies]); } } } diff --git a/resources/js/app.js b/resources/js/app.js index b36eb005ff..675c0f3c24 100644 --- a/resources/js/app.js +++ b/resources/js/app.js @@ -858,6 +858,7 @@ if (document.getElementById("books_listing")) { sortKeys: document.getElementById("category_input") ? document.getElementById("category_input").dataset.value : "", + copies:{} }, methods: { updateCategoryMode: function(index) { @@ -941,18 +942,10 @@ if (document.getElementById("books_listing")) { }, updateCopiesCount: function(index) { - var new_count = parseInt( - prompt( - "Number of copies of this book", - this.books[index].number_of_copies - ) - ); - if (new_count && isFinite(new_count)) { - this.books[index].number_of_copies = new_count; - axios.put(this.updateRoute + "/" + this.books[index].id, { - number_of_copies: new_count, - }); - } + console.log(this.copies, index, "hello"); + axios.put(this.updateRoute + "/" + this.books[index].id, { + copies: this.copies, + }); }, }, diff --git a/resources/views/knowledgecafe/library/books/index.blade.php b/resources/views/knowledgecafe/library/books/index.blade.php index 8e2c8a0375..e3fdc44bff 100644 --- a/resources/views/knowledgecafe/library/books/index.blade.php +++ b/resources/views/knowledgecafe/library/books/index.blade.php @@ -93,18 +93,28 @@
-
Number of copies of this book:
- {{--
+ {{--
Number of copies of this book:
--}} +
@if($officeLocations) @foreach ($bookLocations as $bookLocation)
@if($bookLocation->number_of_copies!==0 ) - {{($bookLocation->location->centre_name)}}: + + {{ $bookLocation->location->centre_name }}: + + + + @endif
@endforeach @endif -
--}} +
From ab7ea3e20dcc23b0652c20476cba33f98fe3f95e Mon Sep 17 00:00:00 2001 From: srivastava-jyoti Date: Tue, 8 Oct 2024 17:20:50 +0530 Subject: [PATCH 10/16] wip --- resources/js/app.js | 16 ++++++++++++++-- .../knowledgecafe/library/books/index.blade.php | 7 ++++--- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/resources/js/app.js b/resources/js/app.js index 675c0f3c24..adf7d7e22e 100644 --- a/resources/js/app.js +++ b/resources/js/app.js @@ -837,6 +837,9 @@ if (document.getElementById("books_listing")) { books: document.getElementById("books_table").dataset.books ? JSON.parse(document.getElementById("books_table").dataset.books) : {}, + bookLocations: document.getElementById("books_table").dataset.locations + ? JSON.parse(document.getElementById("books_table").dataset.locations) + : [], bookCategories: document.getElementById("books_table").dataset.categories ? JSON.parse(document.getElementById("books_table").dataset.categories) : [], @@ -858,7 +861,7 @@ if (document.getElementById("books_listing")) { sortKeys: document.getElementById("category_input") ? document.getElementById("category_input").dataset.value : "", - copies:{} + copies:{}, }, methods: { updateCategoryMode: function(index) { @@ -941,8 +944,17 @@ if (document.getElementById("books_listing")) { return str.length > length ? str.substring(0, length) + "..." : str; }, + getTotalCopies: function(bookId) { + let totalCopies = 0; + this.bookLocations.forEach((location) => { + if (location.book_id === bookId) { + totalCopies += location.number_of_copies; + } + }); + return totalCopies; + }, + updateCopiesCount: function(index) { - console.log(this.copies, index, "hello"); axios.put(this.updateRoute + "/" + this.books[index].id, { copies: this.copies, }); diff --git a/resources/views/knowledgecafe/library/books/index.blade.php b/resources/views/knowledgecafe/library/books/index.blade.php index e3fdc44bff..a06abe429a 100644 --- a/resources/views/knowledgecafe/library/books/index.blade.php +++ b/resources/views/knowledgecafe/library/books/index.blade.php @@ -55,7 +55,7 @@
@endif -
+
@@ -68,7 +68,8 @@

On Kindle

-

@{{ book.number_of_copies }}

+

@{{ getTotalCopies(book.id) }}

+
@can('library_books.delete')
@@ -162,4 +163,4 @@
@include('knowledgecafe.library.books.update-category-modal')
-@endsection \ No newline at end of file +@endsection From 946411ad4da0249a1c991f895aa12e5fbf97ecb4 Mon Sep 17 00:00:00 2001 From: srivastava-jyoti Date: Wed, 9 Oct 2024 12:43:02 +0530 Subject: [PATCH 11/16] added copies --- resources/js/app.js | 4 ++++ .../knowledgecafe/library/books/index.blade.php | 15 ++++++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/resources/js/app.js b/resources/js/app.js index adf7d7e22e..969fa49315 100644 --- a/resources/js/app.js +++ b/resources/js/app.js @@ -971,6 +971,10 @@ if (document.getElementById("books_listing")) { allCategoryInputs.forEach( (checkbox) => (this.categoryInputs[checkbox.value] = checkbox) ); + let locationsData = document.getElementById("books_table").dataset.locationData; + if (locationsData) { + this.copies = JSON.parse(locationsData); + } }, }); } diff --git a/resources/views/knowledgecafe/library/books/index.blade.php b/resources/views/knowledgecafe/library/books/index.blade.php index a06abe429a..5f87190103 100644 --- a/resources/views/knowledgecafe/library/books/index.blade.php +++ b/resources/views/knowledgecafe/library/books/index.blade.php @@ -55,7 +55,7 @@
@endif -
+
@@ -164,3 +164,16 @@ @include('knowledgecafe.library.books.update-category-modal')
@endsection + + From b6718877088e67c9c4fe49309efed7e5f1827b1d Mon Sep 17 00:00:00 2001 From: srivastava-jyoti Date: Wed, 9 Oct 2024 13:39:17 +0530 Subject: [PATCH 12/16] wip --- .../views/knowledgecafe/library/books/index.blade.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/resources/views/knowledgecafe/library/books/index.blade.php b/resources/views/knowledgecafe/library/books/index.blade.php index 5f87190103..6693285ad5 100644 --- a/resources/views/knowledgecafe/library/books/index.blade.php +++ b/resources/views/knowledgecafe/library/books/index.blade.php @@ -55,9 +55,10 @@
@endif -
+
-
+
@@ -95,7 +96,7 @@
{{--
Number of copies of this book:
--}} -
+
@if($officeLocations) @foreach ($bookLocations as $bookLocation)
From b4cb7841a73559bf5d6b9df1fdb2124b50d713f1 Mon Sep 17 00:00:00 2001 From: srivastava-jyoti Date: Wed, 9 Oct 2024 13:50:46 +0530 Subject: [PATCH 13/16] wip --- resources/js/app.js | 2 +- resources/views/knowledgecafe/library/books/index.blade.php | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/resources/js/app.js b/resources/js/app.js index 969fa49315..6d0e2f4ed5 100644 --- a/resources/js/app.js +++ b/resources/js/app.js @@ -971,7 +971,7 @@ if (document.getElementById("books_listing")) { allCategoryInputs.forEach( (checkbox) => (this.categoryInputs[checkbox.value] = checkbox) ); - let locationsData = document.getElementById("books_table").dataset.locationData; + let locationsData = document.getElementById("books-data").dataset.locationData; if (locationsData) { this.copies = JSON.parse(locationsData); } diff --git a/resources/views/knowledgecafe/library/books/index.blade.php b/resources/views/knowledgecafe/library/books/index.blade.php index 6693285ad5..2fa9d93229 100644 --- a/resources/views/knowledgecafe/library/books/index.blade.php +++ b/resources/views/knowledgecafe/library/books/index.blade.php @@ -55,7 +55,11 @@
@endif -
+ @foreach ( $books as $book ) +
+
+ @endforeach +
From c97e18afdad5a561ad45e5e9d05ac9058e4d1624 Mon Sep 17 00:00:00 2001 From: srivastava-jyoti Date: Fri, 11 Oct 2024 16:42:59 +0530 Subject: [PATCH 14/16] wip --- .../KnowledgeCafe/Library/BookController.php | 12 ++++++++++-- resources/js/app.js | 17 ++++++++++++----- .../library/books/index.blade.php | 19 +++---------------- .../library/books/info.blade.php | 4 ++-- 4 files changed, 27 insertions(+), 25 deletions(-) diff --git a/app/Http/Controllers/KnowledgeCafe/Library/BookController.php b/app/Http/Controllers/KnowledgeCafe/Library/BookController.php index f825f2cfa0..ef4447cb4b 100644 --- a/app/Http/Controllers/KnowledgeCafe/Library/BookController.php +++ b/app/Http/Controllers/KnowledgeCafe/Library/BookController.php @@ -53,8 +53,16 @@ public function index(Request $request) $booksBorrowedCount = auth()->user()->booksBorrower->count(); $officeLocations = $this->officeLocationData(); - return view('knowledgecafe.library.books.index', compact('books', 'loggedInUser', 'categories', 'wishlistedBooksCount', 'booksBorrowedCount', 'bookLocations', 'officeLocations')); - } + $books = $books->map(function ($book) use ($bookLocations) { + $locations = $bookLocations->where('book_id', $book->id); + $copies = []; + foreach ($locations as $location) { + $copies[$location->office_location_id] = $location->number_of_copies; + } + $book->copies = $copies; + return $book; + }); + return view('knowledgecafe.library.books.index', compact('books', 'loggedInUser', 'categories', 'wishlistedBooksCount', 'booksBorrowedCount', 'bookLocations', 'officeLocations')); } /** * Show the form for creating a new resource. diff --git a/resources/js/app.js b/resources/js/app.js index 6d0e2f4ed5..1f33795606 100644 --- a/resources/js/app.js +++ b/resources/js/app.js @@ -814,7 +814,7 @@ if (document.getElementById("show_and_save_book")) { this.book["on_kindle"] = document.getElementById("on_kindle").checked ? 1 : 0; - this.book.copies = this.copies; + this.$set(this.book, 'copies', this.copies); axios.post(this.routes.store, this.book).then((response) => { this.buttons.disableSaveButton = false; @@ -971,10 +971,17 @@ if (document.getElementById("books_listing")) { allCategoryInputs.forEach( (checkbox) => (this.categoryInputs[checkbox.value] = checkbox) ); - let locationsData = document.getElementById("books-data").dataset.locationData; - if (locationsData) { - this.copies = JSON.parse(locationsData); - } + let booksDataElements = document.querySelectorAll("[id^='books-data-']"); + booksDataElements.forEach((element) => { + let locationsData = element.dataset.locationData; + if (locationsData) { + let locationCopies = JSON.parse(locationsData); + Object.keys(locationCopies).forEach((locationId) => { + this.$set(this.copies, locationId, locationCopies[locationId]); + }); + } + }); + console.log(this.books, "books"); }, }); } diff --git a/resources/views/knowledgecafe/library/books/index.blade.php b/resources/views/knowledgecafe/library/books/index.blade.php index 2fa9d93229..522e242c17 100644 --- a/resources/views/knowledgecafe/library/books/index.blade.php +++ b/resources/views/knowledgecafe/library/books/index.blade.php @@ -56,7 +56,7 @@
@endif @foreach ( $books as $book ) -
+
@endforeach
@@ -101,7 +101,7 @@ class="col-lg-4 col-md-5 col-8 card book_card mr-1 mb-3 p-2 mr-lg-4">
{{--
Number of copies of this book:
--}}
- @if($officeLocations) + {{-- @if($officeLocations) --}} @foreach ($bookLocations as $bookLocation)
@if($bookLocation->number_of_copies!==0 ) @@ -119,7 +119,7 @@ class="col-lg-4 col-md-5 col-8 card book_card mr-1 mb-3 p-2 mr-lg-4"> @endif
@endforeach - @endif + {{-- @endif --}}
@@ -169,16 +169,3 @@ class="col-lg-4 col-md-5 col-8 card book_card mr-1 mb-3 p-2 mr-lg-4"> @include('knowledgecafe.library.books.update-category-modal')
@endsection - - diff --git a/resources/views/knowledgecafe/library/books/info.blade.php b/resources/views/knowledgecafe/library/books/info.blade.php index 22a7f032a1..28c867a547 100644 --- a/resources/views/knowledgecafe/library/books/info.blade.php +++ b/resources/views/knowledgecafe/library/books/info.blade.php @@ -46,12 +46,12 @@ @foreach ($officeLocations as $officeLocation)
{{ $officeLocation['centre_name'] }} - + placeholder="Number of copies" + />
@endforeach @endif From 35673d83e96a7401803fab8cbd9e039aeba6a590 Mon Sep 17 00:00:00 2001 From: srivastava-jyoti Date: Tue, 15 Oct 2024 16:39:04 +0530 Subject: [PATCH 15/16] wip --- resources/js/app.js | 16 +++++++--------- .../knowledgecafe/library/books/index.blade.php | 9 +++------ 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/resources/js/app.js b/resources/js/app.js index 1f33795606..c94dd255fc 100644 --- a/resources/js/app.js +++ b/resources/js/app.js @@ -971,17 +971,15 @@ if (document.getElementById("books_listing")) { allCategoryInputs.forEach( (checkbox) => (this.categoryInputs[checkbox.value] = checkbox) ); - let booksDataElements = document.querySelectorAll("[id^='books-data-']"); - booksDataElements.forEach((element) => { - let locationsData = element.dataset.locationData; - if (locationsData) { - let locationCopies = JSON.parse(locationsData); - Object.keys(locationCopies).forEach((locationId) => { - this.$set(this.copies, locationId, locationCopies[locationId]); - }); + console.log(this.books); + this.books.forEach(book => { + this.$set(this.copies, book.id, {}); + if (book.copies) { + Object.keys(book.copies).forEach(locationId => { + this.$set(this.copies[book.id], locationId, book.copies[locationId]); + }); } }); - console.log(this.books, "books"); }, }); } diff --git a/resources/views/knowledgecafe/library/books/index.blade.php b/resources/views/knowledgecafe/library/books/index.blade.php index 522e242c17..19ae4e883e 100644 --- a/resources/views/knowledgecafe/library/books/index.blade.php +++ b/resources/views/knowledgecafe/library/books/index.blade.php @@ -99,9 +99,7 @@ class="col-lg-4 col-md-5 col-8 card book_card mr-1 mb-3 p-2 mr-lg-4">
- {{--
Number of copies of this book:
--}}
- {{-- @if($officeLocations) --}} @foreach ($bookLocations as $bookLocation)
@if($bookLocation->number_of_copies!==0 ) @@ -110,16 +108,15 @@ class="col-lg-4 col-md-5 col-8 card book_card mr-1 mb-3 p-2 mr-lg-4"> @endif
@endforeach - {{-- @endif --}}
From 3f2ec3be72d6173db7b4d5a1685176df230b49a4 Mon Sep 17 00:00:00 2001 From: srivastava-jyoti Date: Mon, 4 Nov 2024 16:55:53 +0530 Subject: [PATCH 16/16] cleanups --- resources/js/app.js | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/resources/js/app.js b/resources/js/app.js index c94dd255fc..db3aa9d7ac 100644 --- a/resources/js/app.js +++ b/resources/js/app.js @@ -953,12 +953,19 @@ if (document.getElementById("books_listing")) { }); return totalCopies; }, - - updateCopiesCount: function(index) { - axios.put(this.updateRoute + "/" + this.books[index].id, { - copies: this.copies, + updateCopiesCount(index) { + let updatedCopies = this.books[index].copies; + axios.put(`${this.updateRoute}/${this.books[index].id}`, { + copies: updatedCopies, + }) + .then(response => { + console.log("Copies updated successfully", response); + this.$set(this.books, index, { ...this.books[index], copies: updatedCopies }); + }) + .catch(error => { + console.error("Error updating copies", error); }); - }, + } }, mounted: function() { @@ -971,7 +978,6 @@ if (document.getElementById("books_listing")) { allCategoryInputs.forEach( (checkbox) => (this.categoryInputs[checkbox.value] = checkbox) ); - console.log(this.books); this.books.forEach(book => { this.$set(this.copies, book.id, {}); if (book.copies) {