Index: PostgreSqlDotnetCore/Controllers/BlogController.cs
===================================================================
--- PostgreSqlDotnetCore/Controllers/BlogController.cs	(revision a3ce071e97bad04f989c769589a31427febe9ff3)
+++ PostgreSqlDotnetCore/Controllers/BlogController.cs	(revision 2aea0fddc0f6d0c25f0d44044eeb2ec5930012b9)
@@ -11,72 +11,19 @@
     {
         public BlogController(UserManager<IdentityUser> userManager) : base(userManager)
-
-        {
-
+        {
         }
 
         // GET: Customer
-        /* public async Task<ActionResult> IndexAsync()
-         {
-             // check for permission
-             bool isAuthenticated = User.Identity.IsAuthenticated;
-             if (!isAuthenticated)
-             {
-                 return RedirectToAction("AccessDenied", "Error");
-             }
-             //return View(Enumerable.Empty<UsersClass>());
-             return View(db.BlogPostControllerObj.ToList());
-         }
-        */
-
-        /* public async Task<ActionResult> Index()
-         {
-             // Проверка за автентикација
-             bool isAuthenticated = User.Identity.IsAuthenticated;
-
-             if (!isAuthenticated)
-             {
-                 return RedirectToAction("AccessDenied", "Error");
-             }
-
-             // Список на блог постови
-             var blogPosts = await db.BlogPostControllerObj.ToListAsync();
-
-             // Предавање на ViewBag за проверка на автентикација
-             ViewBag.isAuthenticated = isAuthenticated;
-
-             return View(blogPosts);
-         }*/
-
-        public async Task<ActionResult> Index()
-        {
-            // Проверка за автентикација
+        public async Task<ActionResult> IndexAsync()
+        {
+            // check for permission
             bool isAuthenticated = User.Identity.IsAuthenticated;
-
             if (!isAuthenticated)
             {
                 return RedirectToAction("AccessDenied", "Error");
             }
-
-            // Список на блог постови
-            var blogPosts = await db.BlogUsers.ToListAsync();
-
-            // Вземи тековниот корисник
-            var currentUser = await _userManager.GetUserAsync(User);
-            var customerClass = await db.CustomerObj.SingleOrDefaultAsync(x => x.email == currentUser.Email);
-
-            // Предавање на ViewBag за проверка на автентикација и корисничкиот ID
-            ViewBag.isAuthenticated = isAuthenticated;
-            // no access for standard user
-            ViewBag.OnlyAdminManager = await checkAuthorizationSpecificRoleAsync(RoleConstants.Admin) ?? await checkAuthorizationSpecificRoleAsync(RoleConstants.Manager);
-
-            ViewBag.CurrentUserId = customerClass?.id;
-
-            return View(blogPosts);
-        }
-
-
-
-
+            //return View(Enumerable.Empty<UsersClass>());
+            return View(db.BlogPostControllerObj.ToList());
+        }
 
         // GET: Customer/Details/5
@@ -89,6 +36,4 @@
             }
             BlogPostConsultation blogClass = db.BlogPostControllerObj.Find(id);
-            UsersClass customerClass = await getCrrentUser();
-            ViewBag.isAuthenticated = customerClass;
             if (blogClass == null)
             {
@@ -99,11 +44,9 @@
             // query
             var query = from st in db.BlogPostAnswersObj
-                        where st.BlogPostConsultationid == blogClass.id
+                        where st.blogpostconsultationid == blogClass.id
                         select st;
             //elenaaa
             var blogAnswers = query.ToList();
             blogClass.BlogPostAnswers = blogAnswers;
-            ViewBag.OnlyAdminManager = await checkAuthorizationSpecificRoleAsync(RoleConstants.Admin) ?? await checkAuthorizationSpecificRoleAsync(RoleConstants.Manager);
-            ViewBag.CurrentUserId = customerClass?.id;
             return View(blogClass);
         }
@@ -115,22 +58,13 @@
         //}
 
-        /* public ActionResult Create()
-         {
-             var model = new BlogPostConsultation();
-             return View(model);
-         }*/
-
-        public async Task<ActionResult> CreateAsync()
-        {
-
-            // check for permission
-            //UsersClass customerClass = await checkAuthorizationAsync();
-           // ViewBag.isAuthenticated = await getCrrentUser();
-           UsersClass customerClass = await getCrrentUser();
-            // set if is authenticated
-            ViewBag.isAuthenticated = customerClass;
-            ViewBag.OnlyAdminManager = await checkAuthorizationSpecificRoleAsync(RoleConstants.Admin) ?? await checkAuthorizationSpecificRoleAsync(RoleConstants.Manager);
-
-            return View();
+        public ActionResult Create()
+        {
+            var model = new BlogPostConsultation
+            {
+                //date_askes = DateTime.Now // Поставете го датумот на моменталниот датум
+                // date_askes= DateTime.UtcNow.Date
+                date_askes = DateOnly.FromDateTime(DateTime.UtcNow.Date)
+            };
+            return View(model);
         }
 
@@ -149,17 +83,11 @@
                     var user = await _userManager.GetUserAsync(User);
                     var customerClass = db.CustomerObj.SingleOrDefault(x => x.email == user.Email);
-                   //dodadeno na 25.08
-                    ViewBag.isAuthenticated = await getCrrentUser();
-                    if (customerClass != null)
-                    {
-                        // Поставете users_id на идентификаторот на корисникот
-                        blogClass.users_id = customerClass.id;
-                        //blogClass.date_askes = DateOnly.FromDateTime(DateTime.UtcNow); 
-                        blogClass.date_askes = DateOnly.FromDateTime(DateTime.Now); // Ова ќе стави локално време
-
-                        db.BlogPostControllerObj.Add(blogClass);
-                        await db.SaveChangesAsync();
-                        return RedirectToAction("Index");
-                    }
+                    // blogClass.date_askes = new DateTime();
+                    // blogClass.date_askes = DateTime.UtcNow;
+                    blogClass.date_askes = DateOnly.FromDateTime(DateTime.UtcNow);
+                    blogClass.users_id = customerClass.id;
+                    db.BlogPostControllerObj.Add(blogClass);
+                    db.SaveChanges();
+                return RedirectToAction("Index");
                 }
                 else
@@ -171,10 +99,4 @@
             return View(blogClass);
         }
-
-
-
-
-
-
 
         // GET: Customer/Edit/5
@@ -192,9 +114,6 @@
             }
 
-            // izbriseno na 26.08
-           UsersClass customerClass = await checkAuthorizationAsync();
-            //dodadeno na 26.08
-           // UsersClass customerClass = await checkAuthorizationSpecificRoleAsync(RoleConstants.Admin);
-            ViewBag.isAuthenticated = await getCrrentUser();
+            // check for permission
+            UsersClass customerClass = await checkAuthorizationAsync();
             if (customerClass == null)
             {
@@ -211,8 +130,4 @@
                 }
             }
-            // no access for standard user
-            ViewBag.OnlyAdminManager = await checkAuthorizationSpecificRoleAsync(RoleConstants.Admin) ?? await checkAuthorizationSpecificRoleAsync(RoleConstants.Manager);
-            ViewBag.OnlyAdminManager1 = await checkAuthorizationSpecificRoleAsync(RoleConstants.Admin) ?? await checkAuthorizationSpecificRoleAsync(RoleConstants.Manager);
-
 
             return View(blogClass);
@@ -224,56 +139,28 @@
         [HttpPost]
         [ValidateAntiForgeryToken]
-        /* public ActionResult Edit([Bind(include: "id,date_askes,title,description,users_id")] BlogPostConsultation blogClass)
-         {
-             if (ModelState.IsValid)
-             {
-                 db.Entry(blogClass).State = EntityState.Modified;
-                 db.SaveChanges();
-                 return RedirectToAction("Index");
-             }
-             return View(blogClass);
-         }*/
-
-
-        public async Task<ActionResult> EditAsync(int id, [Bind(include: "id,date_askes,title,description")] BlogPostConsultation blogClass)
+        public ActionResult Edit([Bind(include: "id,date_askes,title,description,users_id")] BlogPostConsultation blogClass)
         {
             if (ModelState.IsValid)
             {
-                var existingBlogClass = await db.BlogPostControllerObj.FindAsync(id);
-                if (existingBlogClass != null)
-                {
-                    
-
-                    // Запамтете ја старата вредност на users_id
-                    blogClass.users_id = existingBlogClass.users_id;
-
-                    db.Entry(existingBlogClass).CurrentValues.SetValues(blogClass);
-                    await db.SaveChangesAsync();
-                    return RedirectToAction("Index");
-                }
-            }
-            return View(blogClass);
-        }
-
-
+                db.Entry(blogClass).State = EntityState.Modified;
+                db.SaveChanges();
+                return RedirectToAction("Index");
+            }
+            return View(blogClass);
+        }
 
         // GET: Customer/Delete/5
-        
         public async Task<ActionResult> DeleteAsync(int? id)
-        {
-            //  UsersClass customerClass = await checkAuthorizationAsync();
-
-            ViewBag.isAuthenticated = await getCrrentUser();
-
+        { 
             if (id == null)
+           {
+               return View(null);
+              //return new HttpStatusCodeResult(HttpStatusCode.BadRequest);
+            }
+           BlogPostConsultation blogClass = db.BlogPostControllerObj.Find(id);
+            if (blogClass == null)
             {
                 return View(null);
-                //return new HttpStatusCodeResult(HttpStatusCode.BadRequest);
-            }
-            BlogPostConsultation blogClass = db.BlogPostControllerObj.Find(id);
-            if (blogClass == null)
-            {
-                return View(null);
-                //return HttpNotFound();
+               //return HttpNotFound();
             }
             // check for permission
@@ -293,24 +180,9 @@
                 }
             }
-            // no access for standard user
-            ViewBag.OnlyAdminManager = await checkAuthorizationSpecificRoleAsync(RoleConstants.Admin) ?? await checkAuthorizationSpecificRoleAsync(RoleConstants.Manager);
-
-            return View(blogClass);
-        }
-
+            return View(blogClass);
+        }
 
         // POST: Customer/Delete/5
-
-        /*
-                [HttpPost, ActionName("Delete")]
-                [ValidateAntiForgeryToken]
-                public ActionResult DeleteConfirmed(int id)
-                {
-                    BlogPostConsultation blogClass = db.BlogPostControllerObj.Find(id);
-                    db.BlogPostControllerObj.Remove(blogClass);
-                    db.SaveChanges();
-                    return RedirectToAction("Index");
-                }
-                */
+     
 
         [HttpPost, ActionName("Delete")]
@@ -318,41 +190,9 @@
         public ActionResult DeleteConfirmed(int id)
         {
-            // Наоѓање на објектот по ID
             BlogPostConsultation blogClass = db.BlogPostControllerObj.Find(id);
-
-            // Проверка дали објектот е пронајден
-            if (blogClass == null)
-            {
-                // Ако објектот не е пронајден, враќаме 404 Not Found или друга соодветна акција
-                return View(null);
-            }
-            //  prvo izbrisi gi site odgovori po sot BlogId e primaren kluc vo drugata tabela
-
-            // query
-            var query = from st in db.BlogPostAnswersObj
-                        where st.BlogPostConsultationid == blogClass.id
-                        select st;
-            //elenaaa
-            var blogAnswers = query.ToList();
-            foreach (BlogPostAnswers answerClass in blogAnswers)
-            {
-                db.BlogPostAnswersObj.Remove(answerClass);
-                db.SaveChanges();
-
-            }
-
-            // Отстранување на објектот ако е пронајден
             db.BlogPostControllerObj.Remove(blogClass);
             db.SaveChanges();
-
-            // Пренасочување на корисникот кон Index страницата
             return RedirectToAction("Index");
         }
-
-        // GET: Customer/Delete/5
-        // GET: Customer/Delete/5
-        // GET: Customer/Delete/5
-
-
 
         protected override void Dispose(bool disposing)
Index: PostgreSqlDotnetCore/Controllers/BlogPostAnswersController.cs
===================================================================
--- PostgreSqlDotnetCore/Controllers/BlogPostAnswersController.cs	(revision a3ce071e97bad04f989c769589a31427febe9ff3)
+++ PostgreSqlDotnetCore/Controllers/BlogPostAnswersController.cs	(revision 2aea0fddc0f6d0c25f0d44044eeb2ec5930012b9)
@@ -14,22 +14,12 @@
 
         // GET: Customer
-        //public ActionResult Index()
-         public async Task<ActionResult> IndexAsync()
-         {
-             //return View(Enumerable.Empty<UsersClass>());
-             UsersClass customerClass = await getCrrentUser();
-
-             // set if is authenticated
-             ViewBag.isAuthenticated = customerClass;
-            ViewBag.OnlyAdminManager = await checkAuthorizationSpecificRoleAsync(RoleConstants.Admin) ?? await checkAuthorizationSpecificRoleAsync(RoleConstants.Manager);
+        public ActionResult Index()
+        {
+            //return View(Enumerable.Empty<UsersClass>());
             return View(db.BlogPostAnswersObj.ToList());
         }
 
-
-
-
         // GET: Customer/Details/5
-        // public ActionResult Details(int? id)
-        public async Task<ActionResult> Details(int? id)
+        public ActionResult Details(int? id)
         {
             if (id == null)
@@ -37,6 +27,4 @@
                 return RedirectToAction("NotExist", "Error");
             }
-            UsersClass customerClass = await getCrrentUser(); // Добијте ја тековната улога на корисникот
-            ViewBag.isAuthenticated = customerClass;
             BlogPostAnswers answerClass = db.BlogPostAnswersObj.Find(id);
             if (answerClass == null)
@@ -44,15 +32,4 @@
                 return RedirectToAction("NotExist", "Error");
             }
-
-
-            // query
-            var query = from st in db.BlogPostAnswersObj
-                        where st.parent_id == answerClass.id
-                        select st;
-            //elenaaa
-            var answersUnderA = query.Where(x => x.id != answerClass.id).ToList();
-
-            answerClass.blogPostAnswers = answersUnderA;
-            ViewBag.OnlyAdminManager = await checkAuthorizationSpecificRoleAsync(RoleConstants.Admin) ?? await checkAuthorizationSpecificRoleAsync(RoleConstants.Manager);
             return View(answerClass);
         }
@@ -69,12 +46,8 @@
             // check for permission
             UsersClass customerClass = await checkAuthorizationAsync();
-           // UsersClass customerClass = await getCrrentUser();
-            // set if is authenticated
-            ViewBag.isAuthenticated = customerClass;
             if (customerClass == null)
             {
                 return RedirectToAction("AccessDenied", "Error");
             }
-            ViewBag.OnlyAdminManager = await checkAuthorizationSpecificRoleAsync(RoleConstants.Admin) ?? await checkAuthorizationSpecificRoleAsync(RoleConstants.Manager);
             return View();
         }
@@ -85,37 +58,12 @@
         [HttpPost]
         [ValidateAntiForgeryToken]
-        public async Task<ActionResult> CreateAsync(int? id, int? parentId, [Bind(include: "reply")] BlogPostAnswers answerClass)
+        public ActionResult Create([Bind(include: "id,parent_id,reply,root_post,usersID")] BlogPostAnswers answerClass)
         {
-
-            //string id = Request.Query["BlogId"];
-            if (id == null && id > 0)
+            if (ModelState.IsValid)
             {
-                return RedirectToAction("NotExist", "Error");
-            }
-            //string id = Request.Query["BlogId"];
-            if (parentId== null && parentId > 0)
-            {
-                return RedirectToAction("NotExist", "Error");
-            }
-            if (answerClass != null && answerClass.reply.Length > 0)
-            {
-
-                var user = await _userManager.GetUserAsync(User);
-                if (user == null)
-                {
-                    return RedirectToAction("AccessDenied", "Error");
-                }
-
-
-                var customerClass = db.CustomerObj.SingleOrDefault(x => x.email == user.Email);
-                answerClass.usersid = customerClass.id;
-                answerClass.BlogPostConsultationid = (int)id;
-                answerClass.parent_id = (int)parentId;
                 db.BlogPostAnswersObj.Add(answerClass);
                 db.SaveChanges();
-                //return RedirectToAction("Index");
-                return RedirectToAction("Details", "Blog", new { id });
+                return RedirectToAction("Index");
             }
-            ViewBag.OnlyAdminManager = await checkAuthorizationSpecificRoleAsync(RoleConstants.Admin) ?? await checkAuthorizationSpecificRoleAsync(RoleConstants.Manager);
 
             return View(answerClass);
@@ -155,17 +103,11 @@
         public ActionResult Edit([Bind(include: "id,parent_id,reply,root_post,usersID")] BlogPostAnswers answerClass)
         {
-
-            BlogPostAnswers answerClassDB = db.BlogPostAnswersObj.Find(answerClass.id);
-            if (answerClassDB != null && !answerClassDB.reply.Equals(answerClass.reply))
+            if (ModelState.IsValid)
             {
-                answerClassDB.reply = answerClass.reply;
-                answerClassDB.parent_id = answerClass.parent_id;
-                db.Entry(answerClassDB).State = EntityState.Modified;
+                db.Entry(answerClass).State = EntityState.Modified;
                 db.SaveChanges();
-                //return RedirectToAction("Index");
-                int id = answerClassDB.BlogPostConsultationid;
-                return RedirectToAction("Details", "Blog", new { id });
+                return RedirectToAction("Index");
             }
-            return View(answerClassDB);
+            return View(answerClass);
         }
 
@@ -173,5 +115,4 @@
         public async Task<ActionResult> DeleteAsync(int? id)
         {
-          
             if (id == null)
             {
@@ -194,6 +135,5 @@
                 }
             }
-            // return View(answerClass);
-             return View(answerClass);
+            return View(answerClass);
         }
 
Index: PostgreSqlDotnetCore/Controllers/CityController.cs
===================================================================
--- PostgreSqlDotnetCore/Controllers/CityController.cs	(revision a3ce071e97bad04f989c769589a31427febe9ff3)
+++ PostgreSqlDotnetCore/Controllers/CityController.cs	(revision 2aea0fddc0f6d0c25f0d44044eeb2ec5930012b9)
@@ -19,39 +19,14 @@
             // check for permission
             UsersClass customerClass = await checkAuthorizationAsync();
-            ViewBag.isAuthenticated = User.Identity.IsAuthenticated;
-
             if (customerClass == null)
             {
                 return RedirectToAction("AccessDenied", "Error");
             }
-
-            var citiess = await db.CitiesObj.ToListAsync();
-            // проба на 23.08
-            ViewBag.OnlyAdminManager = await checkAuthorizationSpecificRoleAsync(RoleConstants.Admin) ?? await checkAuthorizationSpecificRoleAsync(RoleConstants.Manager);
-
-            return View(citiess);
+            //return View(Enumerable.Empty<UsersClass>());
+            return View(db.CitiesObj.ToList());
         }
 
-
-
-
-        /* public async Task<ActionResult> IndexAsync()
-         {
-             // check for permission
-             UsersClass customerClass = await checkAuthorizationAsync();
-             if (customerClass == null)
-             {
-                 return RedirectToAction("AccessDenied", "Error");
-             }
-             //return View(Enumerable.Empty<UsersClass>());
-             return View(db.CitiesObj.ToList());
-         }
-        */
-
-
-
         // GET: Customer/Details/5
-        //public ActionResult Details(int? id)
-        public async Task<ActionResult> Details(int? id)
+        public ActionResult Details(int? id)
         {
             if (id == null)
@@ -60,13 +35,8 @@
             }
             CitiesClass cityClass = db.CitiesObj.Find(id);
-            UsersClass customerClass = await getCrrentUser();
-            ViewBag.isAuthenticated = customerClass;
             if (cityClass == null)
             {
                 return RedirectToAction("NotExist", "Error");
             }
-            // no access for standard user
-            ViewBag.OnlyAdminManager = await checkAuthorizationSpecificRoleAsync(RoleConstants.Admin) ?? await checkAuthorizationSpecificRoleAsync(RoleConstants.Manager);
-
             return View(cityClass);
         }
@@ -78,11 +48,7 @@
         //}
 
-        //public ActionResult Create()
-        public async Task<ActionResult> CreateAsync()
+        public ActionResult Create()
         {
-            UsersClass customerClass = await getCrrentUser();
-            // set if is authenticated
-            ViewBag.isAuthenticated = customerClass;
-            ViewBag.OnlyAdminManager = await checkAuthorizationSpecificRoleAsync(RoleConstants.Admin) ?? await checkAuthorizationSpecificRoleAsync(RoleConstants.Manager);
+            
             return View();
         }
@@ -95,5 +61,4 @@
         public ActionResult Create([Bind(include: "id,name")] CitiesClass cityClass)
         {
-
             if (ModelState.IsValid)
             {
@@ -107,6 +72,5 @@
 
         // GET: Customer/Edit/5
-        //  public ActionResult Edit(int? id)
-        public async Task<ActionResult> Edit(int? id)
+        public ActionResult Edit(int? id)
         {
             if (id == null)
@@ -115,13 +79,8 @@
             }
             CitiesClass cityClass = db.CitiesObj.Find(id);
-            //22.08
-            ViewBag.isAuthenticated = await getCrrentUser();
             if (cityClass == null)
             {
                 return RedirectToAction("NotExist", "Error");
             }
-            // no access for standard user
-            ViewBag.OnlyAdminManager = await checkAuthorizationSpecificRoleAsync(RoleConstants.Admin) ?? await checkAuthorizationSpecificRoleAsync(RoleConstants.Manager);
-
             return View(cityClass);
         }
@@ -144,11 +103,6 @@
 
         // GET: Customer/Delete/5
-        // public ActionResult Delete(int? id)
-        public async Task<ActionResult> Delete(int? id)
+        public ActionResult Delete(int? id)
         {
-
-            UsersClass customerClass = await checkAuthorizationAsync();
-
-            ViewBag.isAuthenticated = await getCrrentUser();
             if (id == null)
             {
@@ -160,7 +114,4 @@
                 return RedirectToAction("NotExist", "Error");
             }
-            // no access for standard user
-            ViewBag.OnlyAdminManager = await checkAuthorizationSpecificRoleAsync(RoleConstants.Admin) ?? await checkAuthorizationSpecificRoleAsync(RoleConstants.Manager);
-
             return View(cityClass);
         }
@@ -185,8 +136,4 @@
             base.Dispose(disposing);
         }
-
-
-
-
     }
 }
Index: PostgreSqlDotnetCore/Controllers/CustomerController.cs
===================================================================
--- PostgreSqlDotnetCore/Controllers/CustomerController.cs	(revision a3ce071e97bad04f989c769589a31427febe9ff3)
+++ PostgreSqlDotnetCore/Controllers/CustomerController.cs	(revision 2aea0fddc0f6d0c25f0d44044eeb2ec5930012b9)
@@ -19,11 +19,5 @@
         public async Task<ActionResult> IndexAsync()
         {
-           UsersClass customerClass = await getCrrentUser();
-           
-            ViewBag.isAuthenticated = User.Identity.IsAuthenticated;
-            ViewBag.CanCreate = customerClass.role_id == RoleConstants.Admin || customerClass.role_id == RoleConstants.Manager;
-            // no access for standard user
-            ViewBag.OnlyAdminManager = await checkAuthorizationSpecificRoleAsync(RoleConstants.Admin) ?? await checkAuthorizationSpecificRoleAsync(RoleConstants.Manager);
-
+            UsersClass customerClass = await getCrrentUser();
             if (customerClass == null)
             {
@@ -32,5 +26,4 @@
             if (customerClass.role_id == RoleConstants.Standard)
             {
-                // searching from DB 
                 
                 var query = from st in db.CustomerObj
@@ -47,6 +40,5 @@
                 return View(db.CustomerObj.ToList());
             }
-
-
+          
         }
 
@@ -64,5 +56,4 @@
             // check for permission
             UsersClass customerClass = await getCrrentUser();
-            ViewBag.isAuthenticated = customerClass;
             if (customerClass == null)
             {
@@ -75,7 +66,4 @@
                 return RedirectToAction("NotExist", "Error");
             }
-            // no access for standard user
-            ViewBag.OnlyAdminManager = await checkAuthorizationSpecificRoleAsync(RoleConstants.Admin) ?? await checkAuthorizationSpecificRoleAsync(RoleConstants.Manager);
-
             return View(customerClass);
         }
@@ -84,17 +72,10 @@
         public async Task<ActionResult> CreateAsync()
         {
-            //ViewBag.CanCreate = customerClass.role_id == RoleConstants.Admin || customerClass.role_id == RoleConstants.Manager;
-
             // check for permission
-            UsersClass customerClass = await checkAuthorizationSpecificRoleAsync(RoleConstants.Admin) ?? await checkAuthorizationSpecificRoleAsync(RoleConstants.Manager);
-            //dodano na 23.08
-            ViewBag.isAuthenticated = await getCrrentUser();
+            UsersClass customerClass = await checkAuthorizationSpecificRoleAsync(RoleConstants.Admin);
             if (customerClass == null)
             {
                 return RedirectToAction("AccessDenied", "Error");
             }
-            // no access for standard user
-            ViewBag.OnlyAdminManager = await checkAuthorizationSpecificRoleAsync(RoleConstants.Admin) ?? await checkAuthorizationSpecificRoleAsync(RoleConstants.Manager);
-
 
             return View();
@@ -143,5 +124,4 @@
 
             customerClass = db.CustomerObj.Find(id);
-            ViewBag.isAuthenticated = await getCrrentUser();
             if (customerClass == null)
             {
@@ -149,7 +129,4 @@
                 //return HttpNotFound();
             }
-            // no access for standard user
-            ViewBag.OnlyAdminManager = await checkAuthorizationSpecificRoleAsync(RoleConstants.Admin) ?? await checkAuthorizationSpecificRoleAsync(RoleConstants.Manager);
-
             return View(customerClass);
         }
@@ -181,12 +158,8 @@
             }
             UsersClass customerClass = await getCrrentUser();
-            ViewBag.isAuthenticated = await getCrrentUser();
             if (customerClass == null)
             {
                 return RedirectToAction("AccessDenied", "Error");
             }
-            
-            // no access for standard user
-            ViewBag.OnlyAdminManager = await checkAuthorizationSpecificRoleAsync(RoleConstants.Admin) ?? await checkAuthorizationSpecificRoleAsync(RoleConstants.Manager);
             return View(customerClass);
         }
Index: PostgreSqlDotnetCore/Controllers/ErrorController.cs
===================================================================
--- PostgreSqlDotnetCore/Controllers/ErrorController.cs	(revision a3ce071e97bad04f989c769589a31427febe9ff3)
+++ PostgreSqlDotnetCore/Controllers/ErrorController.cs	(revision 2aea0fddc0f6d0c25f0d44044eeb2ec5930012b9)
@@ -2,33 +2,16 @@
 {
     using Microsoft.AspNetCore.Http;
-    using Microsoft.AspNetCore.Identity;
     using Microsoft.AspNetCore.Mvc;
-    using PostgreSqlDotnetCore.Models;
-    using System.Threading.Tasks;
 
-    public class ErrorController : BaseController
+    public class ErrorController : Controller
     {
-        public ErrorController(UserManager<IdentityUser> userManager) : base(userManager)
+        // GET: ErrorController
+        public IActionResult AccessDenied()
         {
-
-        }
-        // GET: ErrorController
-        public async Task<IActionResult> AccessDeniedAsync()
-        {
-            // set if is authenticated
-            ViewBag.isAuthenticated = await getCrrentUser();
-            // no access for standard user
-            ViewBag.OnlyAdminManager = await checkAuthorizationSpecificRoleAsync(RoleConstants.Admin) ?? await checkAuthorizationSpecificRoleAsync(RoleConstants.Manager);
-
             return View();
         }
         // GET: ErrorController
-        public async Task<IActionResult> NotExistAsync()
+        public IActionResult NotExist()
         {
-            // set if is authenticated
-            ViewBag.isAuthenticated = await getCrrentUser();
-            // no access for standard user
-            ViewBag.OnlyAdminManager = await checkAuthorizationSpecificRoleAsync(RoleConstants.Admin) ?? await checkAuthorizationSpecificRoleAsync(RoleConstants.Manager);
-
             return View();
         }
Index: PostgreSqlDotnetCore/Controllers/HomeController.cs
===================================================================
--- PostgreSqlDotnetCore/Controllers/HomeController.cs	(revision a3ce071e97bad04f989c769589a31427febe9ff3)
+++ PostgreSqlDotnetCore/Controllers/HomeController.cs	(revision 2aea0fddc0f6d0c25f0d44044eeb2ec5930012b9)
@@ -1,14 +1,12 @@
 ﻿using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.EntityFrameworkCore;
 using PostgreSqlDotnetCore.Data;
 using PostgreSqlDotnetCore.Models;
 using System.Diagnostics;
-using System.Web.Mvc;
 
 namespace PostgreSqlDotnetCore.Controllers
 {
 
-    public class HomeController : BaseController
+    public class HomeController : Controller
     {
         private ApplicationDbContext db = new ApplicationDbContext();
@@ -17,5 +15,5 @@
         private readonly ILogger<HomeController> _logger;
 
-        public HomeController(ILogger<HomeController> logger, UserManager<IdentityUser> userManager) : base(userManager)
+        public HomeController(ILogger<HomeController> logger, UserManager<IdentityUser> userManager)
         {
             _logger = logger;
@@ -31,5 +29,5 @@
                 if (user != null)
                 {
-                    UsersClass customerClass = db.CustomerObj.SingleOrDefault(x => x.email == user.Email);
+                    UsersClass customerClass = db.CustomerObj.SingleOrDefault(x=> x.email == user.Email);
                     if (customerClass == null)
                     {
@@ -44,7 +42,5 @@
                                 lastName = nameLastName[0].Split('.')[1];
                             }
-                        }
-                        catch (Exception ex)
-                        {
+                        } catch(Exception ex) { 
                         }
                         db.CustomerObj.Add(new UsersClass(
@@ -60,44 +56,18 @@
                         db.SaveChanges();
                     }
-                    // set if is authenticated
-                    ViewBag.isAuthenticated = await getCrrentUser();
-                    // проба на 23.08
-                    // no access for standard user
-                    ViewBag.OnlyAdminManager = await checkAuthorizationSpecificRoleAsync(RoleConstants.Admin) ?? await checkAuthorizationSpecificRoleAsync(RoleConstants.Manager);
 
                 }
 
             }
-            else
-            {
-                ViewBag.isAuthenticated = null;
-            }
             ViewBag.ShowTopBar = true;
-
             return View();
         }
 
-        public async Task<IActionResult> PrivacyAsync()
+        public IActionResult Privacy()
         {
-
-            // set if is authenticated
-            ViewBag.isAuthenticated = await getCrrentUser();
-            // no access for standard user
-            ViewBag.OnlyAdminManager = await checkAuthorizationSpecificRoleAsync(RoleConstants.Admin) ?? await checkAuthorizationSpecificRoleAsync(RoleConstants.Manager);
-
             return View();
         }
-        public async Task<IActionResult> ContactAsync()
+        public IActionResult Contact()
         {
-
-            //var query = db.Database.ExecuteSqlRaw("CALL get_pet_details()");
-            //var query = db.Database.ExecuteSqlRaw("SELECT * FROM get_pet_details()");
-
-
-            // set if is authenticated
-            ViewBag.isAuthenticated = await getCrrentUser();
-            // no access for standard user
-            ViewBag.OnlyAdminManager = await checkAuthorizationSpecificRoleAsync(RoleConstants.Admin) ?? await checkAuthorizationSpecificRoleAsync(RoleConstants.Manager);
-
             return View();
         }
Index: PostgreSqlDotnetCore/Controllers/JobsController.cs
===================================================================
--- PostgreSqlDotnetCore/Controllers/JobsController.cs	(revision a3ce071e97bad04f989c769589a31427febe9ff3)
+++ PostgreSqlDotnetCore/Controllers/JobsController.cs	(revision 2aea0fddc0f6d0c25f0d44044eeb2ec5930012b9)
@@ -12,6 +12,4 @@
         public JobsController(UserManager<IdentityUser> userManager) : base(userManager)
         {
-            // set if is authenticated
-            ViewBag.isAuthenticated = new UsersClass();
         }
 
Index: PostgreSqlDotnetCore/Controllers/PetCaresController.cs
===================================================================
--- PostgreSqlDotnetCore/Controllers/PetCaresController.cs	(revision a3ce071e97bad04f989c769589a31427febe9ff3)
+++ PostgreSqlDotnetCore/Controllers/PetCaresController.cs	(revision 2aea0fddc0f6d0c25f0d44044eeb2ec5930012b9)
@@ -2,5 +2,4 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.AspNetCore.Mvc.Rendering;
 using PostgreSqlDotnetCore.Models;
 using System;
@@ -15,72 +14,48 @@
         }
 
-
-        [HttpGet]
-        /*  public async Task<ActionResult> Create()
-          {
-
-              var vetCenters = await db.VetCentersObj.ToListAsync();
-
-              ViewBag.VetCenters = new SelectList(vetCenters, "id", "name");
-
-              return View();
-          }*/
-        public async Task<ActionResult> Create()
-        {
-
-
-            UsersClass customerClass = await getCrrentUser();
-
-            ViewBag.isAuthenticated = customerClass;
-            var vetCenters = await db.VetCentersObj.ToListAsync();
-            ViewBag.VetCenters = new SelectList(vetCenters, "id", "name");
-
-
-            // check if the user is authenticated so we can take only his pets
-            if (customerClass != null)
-            {
-                var queryPetsByUser = from st in db.PetsObj
-                                      where st.usersid == customerClass.id
-                                      select st;
-                var userPets = await queryPetsByUser.ToListAsync<PetsClass>();
-                ViewBag.Pets = new SelectList(userPets, "id", "name");
-
-            }
-            return View();
-        }
-
-
-
-
         // GET: Customer
         public async Task<ActionResult> IndexAsync()
         {
             // check for permission
-            bool isAuthenticated = User.Identity.IsAuthenticated;
             UsersClass customerClass = await getCrrentUser();
-            // set if is authenticated
-            ViewBag.isAuthenticated = customerClass;
             if (customerClass == null)
             {
                 return RedirectToAction("AccessDenied", "Error");
             }
-            // no access for standard user
-            ViewBag.OnlyAdminManager = await checkAuthorizationSpecificRoleAsync(RoleConstants.Admin) ?? await checkAuthorizationSpecificRoleAsync(RoleConstants.Manager);
-
             if (customerClass.role_id == RoleConstants.Standard)
             {
                 // query
-                var query = from st in db.PetCaresObj
+                            var query = from st in db.PetCaresObj
                             where st.usersid == customerClass.id
                             select st;
 
-                var userPetCares =
-                    await query.Include(n => n.PetsClass).ToListAsync<Pet_CaresClass>();
+                var userPets =
+                    //db.PetCaresObj.FromSql($"SELECT * FROM pets where usersid={customerClass.id}").ToListAsync();
+                    await query.ToListAsync<Pet_CaresClass>();
 
-                return View(userPetCares);
-            }
-            else
+                return View(userPets);
+
+                PetCareAllData petCareAllData = new PetCareAllData();
+                petCareAllData.PetCares = userPets;
+
+
+                // query
+                var queryVetCenters = from kk in db.VetCentersObj
+                            select kk;
+
+                // query
+                var queryUsers = from st in db.CustomerObj
+                                 select st;
+
+                var users = await queryUsers.ToListAsync<UsersClass>();
+                petCareAllData.Users = users;
+
+                //var vetCenters = await queryVetCenters.ToListAsync<VetCenter>();
+                //petCareAllData.VetCenters = vetCenters;
+
+                return View(petCareAllData);
+            } else
             {
-                return View(db.PetCaresObj.Include(n => n.PetsClass).ToList());
+                return View(db.PetCaresObj.ToList());
             }
 
@@ -88,5 +63,5 @@
 
         // GET: Customer/Details/5
-        public async Task<ActionResult> Details(int? id)
+        public ActionResult Details(int? id)
         {
             if (id == null)
@@ -94,6 +69,4 @@
                 return RedirectToAction("NotExist", "Error");
             }
-            UsersClass customerClass = await getCrrentUser();
-            ViewBag.isAuthenticated = customerClass;
             Pet_CaresClass peClass = db.PetCaresObj.Find(id);
             if (peClass == null)
@@ -101,7 +74,4 @@
                 return RedirectToAction("NotExist", "Error");
             }
-            // no access for standard user
-            ViewBag.OnlyAdminManager = await checkAuthorizationSpecificRoleAsync(RoleConstants.Admin) ?? await checkAuthorizationSpecificRoleAsync(RoleConstants.Manager);
-
             return View(peClass);
         }
@@ -113,9 +83,9 @@
         //}
 
-        /*public ActionResult Create()
+        public ActionResult Create()
         {
             
             return View();
-        }*/
+        }
 
         // POST: Customer/Create
@@ -124,5 +94,5 @@
         [HttpPost]
         [ValidateAntiForgeryToken]
-        public async Task<ActionResult> CreateAsync([Bind(include: "id,title,description,dateending, start_date, usersid, vetcentersid, pet_id")] Pet_CaresClass peClass)
+        public async Task<ActionResult> CreateAsync([Bind(include: "id,title,description,dateending, usersid, vetcentersid")] Pet_CaresClass peClass)
         {
             bool isAuthenticated = User.Identity.IsAuthenticated;
@@ -131,16 +101,9 @@
                 return RedirectToAction("AccessDenied", "Error");
             }
-            ModelState.Remove("PetsClass");
-            ViewBag.isAuthenticated = new UsersClass();
-            // no access for standard user
-            ViewBag.OnlyAdminManager = await checkAuthorizationSpecificRoleAsync(RoleConstants.Admin) ?? await checkAuthorizationSpecificRoleAsync(RoleConstants.Manager);
-            UsersClass customerClass =  null;
             if (ModelState.IsValid)
             {
-                ViewBag.isAuthenticated = new UsersClass();
                 peClass.dateending = DateTime.SpecifyKind(peClass.dateending, DateTimeKind.Utc);
-                peClass.start_date = DateTime.SpecifyKind(peClass.start_date, DateTimeKind.Utc);
                 var user = await _userManager.GetUserAsync(User);
-                customerClass = db.CustomerObj.SingleOrDefault(x => x.email == user.Email);
+                var customerClass = db.CustomerObj.SingleOrDefault(x => x.email == user.Email);
                 peClass.usersid = customerClass.id;
                 db.PetCaresObj.Add(peClass);
@@ -148,55 +111,10 @@
                 return RedirectToAction("Index");
             }
-            var vetCenters = await db.VetCentersObj.ToListAsync();
-            ViewBag.VetCenters = new SelectList(vetCenters, "id", "name");
-
-            if (customerClass != null)
-            {
-                var queryPetsByUser = from st in db.PetsObj
-                                      where st.usersid == customerClass.id
-                                      select st;
-                var userPets = await queryPetsByUser.ToListAsync<PetsClass>();
-                ViewBag.Pets = new SelectList(userPets, "id", "name");
-
-            }
 
             return View(peClass);
         }
 
-
-
         // GET: Customer/Edit/5
-        /*  public ActionResult Edit(int? id)
-          {
-              if (id == null)
-              {
-                  return RedirectToAction("NotExist", "Error");
-              }
-              Pet_CaresClass peClass = db.PetCaresObj.Find(id);
-              if (peClass == null)
-              {
-                  return RedirectToAction("NotExist", "Error");
-              }
-
-
-              return View(peClass);
-          }*/
-        // GET: Customer/Edit/5
-        /* public  ActionResult Edit(int? id)
-         {
-             if (id == null)
-             {
-                 return RedirectToAction("NotExist", "Error");
-             }
-             Pet_CaresClass peClass = db.PetCaresObj.Find(id);
-             if (peClass == null)
-             {
-                 return RedirectToAction("NotExist", "Error");
-             }
-
-
-             return View(peClass);
-         }*/
-        public async Task<ActionResult> Edit(int? id)
+        public ActionResult Edit(int? id)
         {
             if (id == null)
@@ -204,30 +122,11 @@
                 return RedirectToAction("NotExist", "Error");
             }
-
-            Pet_CaresClass peClass = await db.PetCaresObj.FindAsync(id);
+            Pet_CaresClass peClass = db.PetCaresObj.Find(id);
             if (peClass == null)
             {
                 return RedirectToAction("NotExist", "Error");
             }
-
-            var vetCenters = await db.VetCentersObj.ToListAsync();
-            ViewBag.VetCenters = new SelectList(vetCenters, "id", "name", peClass.vetcentersid);
-            // dodadeno na 22.08
-            UsersClass customerClass = await getCrrentUser();
-            // check if the user is authenticated so we can take only his pets
-            if (customerClass != null)
-            {
-                var queryPetsByUser = from st in db.PetsObj
-                                      where st.usersid == customerClass.id
-                                      select st;
-                var userPets = await queryPetsByUser.ToListAsync<PetsClass>();
-                ViewBag.Pets = new SelectList(userPets, "id", "name");
-
-            }
-            ViewBag.isAuthenticated = customerClass;
             return View(peClass);
         }
-
-
 
         // POST: Customer/Edit/5
@@ -236,5 +135,5 @@
         [HttpPost]
         [ValidateAntiForgeryToken]
-        public async Task<ActionResult> EditAsync([Bind(include: "id,title,description,dateending, vetcentersid, pet_id")] Pet_CaresClass peClass)
+        public async Task<ActionResult> EditAsync([Bind(include: "id,title,description,dateending, vetcentersid")] Pet_CaresClass peClass)
         {
             bool isAuthenticated = User.Identity.IsAuthenticated;
@@ -243,10 +142,5 @@
                 return RedirectToAction("AccessDenied", "Error");
             }
-
-            ModelState.Remove("PetsClass");
-            ViewBag.isAuthenticated = await getCrrentUser();
-            // no access for standard user
-            ViewBag.OnlyAdminManager = await checkAuthorizationSpecificRoleAsync(RoleConstants.Admin) ?? await checkAuthorizationSpecificRoleAsync(RoleConstants.Manager);
-
+             
             if (ModelState.IsValid)
             {
@@ -262,9 +156,6 @@
         }
 
-
-
-
         // GET: Customer/Delete/5
-        public async Task<ActionResult> Delete(int? id)
+        public ActionResult Delete(int? id)
         {
             if (id == null)
@@ -272,6 +163,4 @@
                 return RedirectToAction("NotExist", "Error");
             }
-            UsersClass customerClass = await getCrrentUser(); // Добијте ја тековната улога на корисникот
-            ViewBag.isAuthenticated = customerClass;
             Pet_CaresClass peClass = db.PetCaresObj.Find(id);
             if (peClass == null)
@@ -279,33 +168,15 @@
                 return RedirectToAction("NotExist", "Error");
             }
-            // no access for standard user
-            ViewBag.OnlyAdminManager = await checkAuthorizationSpecificRoleAsync(RoleConstants.Admin) ?? await checkAuthorizationSpecificRoleAsync(RoleConstants.Manager);
-
             return View(peClass);
         }
 
         // POST: Customer/Delete/5
-        /*  [HttpPost, ActionName("Delete")]
-          [ValidateAntiForgeryToken]
-          public ActionResult DeleteConfirmed(int id)
-          {
-              Pet_CaresClass peClass = db.PetCaresObj.Find(id);
-              db.PetCaresObj.Remove(peClass);
-              db.SaveChanges();
-              return RedirectToAction("Index");
-          }
-        */
-
         [HttpPost, ActionName("Delete")]
         [ValidateAntiForgeryToken]
-        public async Task<ActionResult> DeleteConfirmed(int id)
+        public ActionResult DeleteConfirmed(int id)
         {
-            Pet_CaresClass peClass = await db.PetCaresObj.FindAsync(id);
-            if (peClass == null)
-            {
-                return RedirectToAction("NotExist", "Error");
-            }
+            Pet_CaresClass peClass = db.PetCaresObj.Find(id);
             db.PetCaresObj.Remove(peClass);
-            await db.SaveChangesAsync();
+            db.SaveChanges();
             return RedirectToAction("Index");
         }
Index: PostgreSqlDotnetCore/Controllers/PetDiagnosticsControler.cs
===================================================================
--- PostgreSqlDotnetCore/Controllers/PetDiagnosticsControler.cs	(revision a3ce071e97bad04f989c769589a31427febe9ff3)
+++ 	(revision )
@@ -1,94 +1,0 @@
-﻿namespace PostgreSqlDotnetCore.Controllers
-{
-    using Microsoft.AspNetCore.Http;
-    using Microsoft.AspNetCore.Identity;
-    using Microsoft.AspNetCore.Mvc;
-    using Microsoft.Data.SqlClient;
-    using Microsoft.EntityFrameworkCore;
-    using PostgreSqlDotnetCore.Models;
-    using System.Threading.Tasks;
-
-    public class PetDiagnosticsControler : BaseController
-    {
-        public PetDiagnosticsControler(UserManager<IdentityUser> userManager) : base(userManager)
-        {
-
-        }
-        // GET: PetDiagnostics
-        public async Task<ActionResult> IndexAsync()
-        {
-            var query = await db.PetDetailsProcedureObj.ToListAsync();
-
-            return View();
-        }
-
-        // GET: PetDiagnostics/Details/5
-        public ActionResult Details(int id)
-        {
-            return View();
-        }
-
-        // GET: PetDiagnostics/Create
-        public ActionResult Create()
-        {
-            return View();
-        }
-
-        // POST: PetDiagnostics/Create
-        [HttpPost]
-        [ValidateAntiForgeryToken]
-        public ActionResult Create(IFormCollection collection)
-        {
-            try
-            {
-                return RedirectToAction(nameof(IndexAsync));
-            }
-            catch
-            {
-                return View();
-            }
-        }
-
-        // GET: PetDiagnostics/Edit/5
-        public ActionResult Edit(int id)
-        {
-            return View();
-        }
-
-        // POST: PetDiagnostics/Edit/5
-        [HttpPost]
-        [ValidateAntiForgeryToken]
-        public ActionResult Edit(int id, IFormCollection collection)
-        {
-            try
-            {
-                return RedirectToAction(nameof(IndexAsync));
-            }
-            catch
-            {
-                return View();
-            }
-        }
-
-        // GET: PetDiagnostics/Delete/5
-        public ActionResult Delete(int id)
-        {
-            return View();
-        }
-
-        // POST: PetDiagnostics/Delete/5
-        [HttpPost]
-        [ValidateAntiForgeryToken]
-        public ActionResult Delete(int id, IFormCollection collection)
-        {
-            try
-            {
-                return RedirectToAction(nameof(IndexAsync));
-            }
-            catch
-            {
-                return View();
-            }
-        }
-    }
-}
Index: PostgreSqlDotnetCore/Controllers/PetsController.cs
===================================================================
--- PostgreSqlDotnetCore/Controllers/PetsController.cs	(revision a3ce071e97bad04f989c769589a31427febe9ff3)
+++ PostgreSqlDotnetCore/Controllers/PetsController.cs	(revision 2aea0fddc0f6d0c25f0d44044eeb2ec5930012b9)
@@ -19,18 +19,12 @@
             // check for permission
             UsersClass customerClass = await getCrrentUser();
-
-            // set if is authenticated
-            ViewBag.isAuthenticated = customerClass;
             if (customerClass == null)
             {
                 return RedirectToAction("AccessDenied", "Error");
             }
-            // no access for standard user
-            ViewBag.OnlyAdminManager = await checkAuthorizationSpecificRoleAsync(RoleConstants.Admin) ?? await checkAuthorizationSpecificRoleAsync(RoleConstants.Manager);
-
             if (customerClass.role_id == RoleConstants.Standard)
             {
-                // filter user pets by UserID
-                var query = from st in db.PetsObj
+                // kco
+                            var query = from st in db.PetsObj
                             where st.usersid == customerClass.id
                             select st;
@@ -40,6 +34,5 @@
                     await query.ToListAsync<PetsClass>();
                 return View(userPets);
-            }
-            else
+            } else
             {
                 return View(db.PetsObj.ToList());
@@ -49,95 +42,5 @@
 
         // GET: Customer/Details/5
-        /* public ActionResult Details(int? id)
-         {
-             if (id == null)
-             {
-                 return RedirectToAction("NotExist", "Error");
-             }
-             PetsClass peClass = db.PetsObj.Find(id);
-             if (peClass == null)
-             {
-                 return RedirectToAction("NotExist", "Error");
-             }
-             return View(peClass);
-         }*/
-
-        public async Task<ActionResult> Details(int? id)
-        {
-            if (id == null)
-            {
-                return RedirectToAction("NotExist", "Error");
-            }
-
-            UsersClass customerClass = await getCrrentUser(); // Добијте ја тековната улога на корисникот
-            ViewBag.isAuthenticated = customerClass;
-
-            PetsClass peClass = await db.PetsObj.FindAsync(id);
-            if (peClass == null)
-            {
-                return RedirectToAction("NotExist", "Error");
-            }
-            // no access for standard user
-            ViewBag.OnlyAdminManager = await checkAuthorizationSpecificRoleAsync(RoleConstants.Admin) ?? await checkAuthorizationSpecificRoleAsync(RoleConstants.Manager);
-
-
-            return View(peClass);
-        }
-
-        // GET: Customer/Create
-        //public ActionResult Create()
-        //{
-        //    return View();
-        //}
-
-        public async Task<ActionResult> CreateAsync()
-        {
-
-            // check for permission
-            UsersClass customerClass = await getCrrentUser();
-            // set if is authenticated
-            ViewBag.isAuthenticated = customerClass;
-            return View();
-        }
-
-        // POST: Customer/Create
-        // To protect from overposting attacks, enable the specific properties you want to bind to, for 
-        // more details see https://go.microsoft.com/fwlink/?LinkId=317598.
-        [HttpPost]
-        [ValidateAntiForgeryToken]
-        public async Task<ActionResult> CreateAsync([Bind(include: "id,name,color,description,dateofbirthday, usersid,typeofpetsid")] PetsClass peClass)
-        {
-            bool isAuthenticated = User.Identity.IsAuthenticated;
-            if (!isAuthenticated)
-            {
-                // set if is authenticated
-                ViewBag.isAuthenticated = null;
-                return RedirectToAction("AccessDenied", "Error");
-            }
-            ViewBag.isAuthenticated = new UsersClass();
-            // no access for standard user
-            ViewBag.OnlyAdminManager = await checkAuthorizationSpecificRoleAsync(RoleConstants.Admin) ?? await checkAuthorizationSpecificRoleAsync(RoleConstants.Manager);
-
-            if (ModelState.IsValid)
-            {
-                // set if is authenticated
-                ViewBag.isAuthenticated = new UsersClass();
-                // peClass.dateofbirthday = DateTime.SpecifyKind(peClass.dateofbirthday, DateTimeKind.Utc);
-                var user = await _userManager.GetUserAsync(User);
-                var customerClass = db.CustomerObj.SingleOrDefault(x => x.email == user.Email);
-                peClass.usersid = customerClass.id;
-                // voa go pisav tuka na 18.02
-                // PetsClass.dateofbirthday = DateOnly.FromDateTime(DateTime.UtcNow);
-                db.PetsObj.Add(peClass);
-                db.SaveChanges();
-                return RedirectToAction("Index");
-            }
-
-            return View(peClass);
-        }
-
-        // GET: Customer/Edit/5
-        // public ActionResult Edit(int? id)
-        public async Task<ActionResult> Edit(int? id)
+        public ActionResult Details(int? id)
         {
             if (id == null)
@@ -150,9 +53,59 @@
                 return RedirectToAction("NotExist", "Error");
             }
-            // додадено на 21.08
-            ViewBag.isAuthenticated = await getCrrentUser();
-            // no access for standard user
-            ViewBag.OnlyAdminManager = await checkAuthorizationSpecificRoleAsync(RoleConstants.Admin) ?? await checkAuthorizationSpecificRoleAsync(RoleConstants.Manager);
+            return View(peClass);
+        }
 
+        // GET: Customer/Create
+        //public ActionResult Create()
+        //{
+        //    return View();
+        //}
+
+        public ActionResult Create()
+        {
+            
+            return View();
+        }
+
+        // POST: Customer/Create
+        // To protect from overposting attacks, enable the specific properties you want to bind to, for 
+        // more details see https://go.microsoft.com/fwlink/?LinkId=317598.
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        public async Task<ActionResult> CreateAsync([Bind(include: "id,color,description,dateofbirthday, usersid,typeofpetsid")] PetsClass peClass)
+        {
+            bool isAuthenticated = User.Identity.IsAuthenticated;
+            if (!isAuthenticated)
+            {
+                return RedirectToAction("AccessDenied", "Error");
+            }
+            if (ModelState.IsValid)
+            {
+               // peClass.dateofbirthday = DateTime.SpecifyKind(peClass.dateofbirthday, DateTimeKind.Utc);
+                var user = await _userManager.GetUserAsync(User);
+                var customerClass = db.CustomerObj.SingleOrDefault(x => x.email == user.Email);
+                peClass.usersid = customerClass.id;
+                // voa go pisav tuka na 18.02
+               // PetsClass.dateofbirthday = DateOnly.FromDateTime(DateTime.UtcNow);
+                db.PetsObj.Add(peClass);
+                db.SaveChanges();
+                return RedirectToAction("Index");
+            }
+
+            return View(peClass);
+        }
+
+        // GET: Customer/Edit/5
+        public ActionResult Edit(int? id)
+        {
+            if (id == null)
+            {
+                return RedirectToAction("NotExist", "Error");
+            }
+            PetsClass peClass = db.PetsObj.Find(id);
+            if (peClass == null)
+            {
+                return RedirectToAction("NotExist", "Error");
+            }
             return View(peClass);
         }
@@ -163,28 +116,16 @@
         [HttpPost]
         [ValidateAntiForgeryToken]
-        public async Task<ActionResult> EditAsync([Bind(include: "id,name, color,description,dateofbirthday, usersid,typeofpetsid")] PetsClass peClass)
+        public async Task<ActionResult> EditAsync([Bind(include: "id,color,description,dateofbirthday, usersid,typeofpetsid")] PetsClass peClass)
         {
             bool isAuthenticated = User.Identity.IsAuthenticated;
-            ViewBag.isAuthenticated = await getCrrentUser();
-
             if (!isAuthenticated)
             {
-                // set if is authenticated
-                ViewBag.isAuthenticated = null;
                 return RedirectToAction("AccessDenied", "Error");
             }
-
-            // set if is authenticated
-            // додадено и избришено
-            ViewBag.isAuthenticated = await getCrrentUser();
-            //ViewBag.isAuthenticated = new UsersClass();
-            // no access for standard user
-            ViewBag.OnlyAdminManager = await checkAuthorizationSpecificRoleAsync(RoleConstants.Admin) ?? await checkAuthorizationSpecificRoleAsync(RoleConstants.Manager);
-
-
+             
             if (ModelState.IsValid)
             {
                 //peClass.dateofbirthday = DateTime.SpecifyKind(peClass.dateofbirthday, DateTimeKind.Utc);
-
+                
                 var user = await _userManager.GetUserAsync(User);
                 var customerClass = db.CustomerObj.SingleOrDefault(x => x.email == user.Email);
@@ -198,19 +139,5 @@
 
         // GET: Customer/Delete/5
-        /* public ActionResult Delete(int? id)
-         {
-             if (id == null)
-             {
-                 return RedirectToAction("NotExist", "Error");
-             }
-             PetsClass peClass = db.PetsObj.Find(id);
-             if (peClass == null)
-             {
-                 return RedirectToAction("NotExist", "Error");
-             }
-             return View(peClass);
-         }*/
-
-        public async Task<ActionResult> Delete(int? id)
+        public ActionResult Delete(int? id)
         {
             if (id == null)
@@ -218,17 +145,9 @@
                 return RedirectToAction("NotExist", "Error");
             }
-
-            UsersClass customerClass = await getCrrentUser(); // Добијте ја тековната улога на корисникот
-            ViewBag.isAuthenticated = customerClass;
-
-            PetsClass peClass = await db.PetsObj.FindAsync(id);
+            PetsClass peClass = db.PetsObj.Find(id);
             if (peClass == null)
             {
                 return RedirectToAction("NotExist", "Error");
             }
-            // no access for standard user
-            ViewBag.OnlyAdminManager = await checkAuthorizationSpecificRoleAsync(RoleConstants.Admin) ?? await checkAuthorizationSpecificRoleAsync(RoleConstants.Manager);
-
-
             return View(peClass);
         }
Index: PostgreSqlDotnetCore/Controllers/ProductsController.cs
===================================================================
--- PostgreSqlDotnetCore/Controllers/ProductsController.cs	(revision a3ce071e97bad04f989c769589a31427febe9ff3)
+++ PostgreSqlDotnetCore/Controllers/ProductsController.cs	(revision 2aea0fddc0f6d0c25f0d44044eeb2ec5930012b9)
@@ -2,10 +2,6 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
-using Npgsql;
-using System.Linq;
 using PostgreSqlDotnetCore.Models;
-//using System.Net;
-using System.Threading.Tasks;
-using PostgreSqlDotnetCore.Data;
+using System.Net;
 
 namespace PostgreSqlDotnetCore.Controllers
@@ -13,5 +9,4 @@
     public class ProductsController : BaseController
     {
-
         public ProductsController(UserManager<IdentityUser> userManager) : base(userManager)
         {
@@ -26,12 +21,6 @@
         //}
         // GET: Customer
-        public async Task<ActionResult> IndexAsync(string? searchString)
+        public ActionResult Index(string? searchString)
         {
-            // set if is authenticated
-            ViewBag.isAuthenticated = await getCrrentUser();
-            ViewBag.hasAccess = await checkAuthorizationAsync();
-            // no access for standard user
-            ViewBag.OnlyAdminManager = await checkAuthorizationSpecificRoleAsync(RoleConstants.Admin) ?? await checkAuthorizationSpecificRoleAsync(RoleConstants.Manager);
-
             if (!String.IsNullOrEmpty(searchString))
             {
@@ -48,8 +37,6 @@
         }
 
-        
-
         // GET: Customer/Details/5
-        public async Task<ActionResult> Details(int? id)
+        public ActionResult Details(int? id)
         {
             if (id == null)
@@ -57,11 +44,4 @@
                 return RedirectToAction("NotExist", "Error");
             }
-            // додано на 28.08
-         
-
-
-
-          UsersClass customerClass = await getCrrentUser(); 
-            ViewBag.isAuthenticated = customerClass;
             ProductsClass prodClass = db.ProductObj.Find(id);
             if (prodClass == null)
@@ -69,7 +49,4 @@
                 return RedirectToAction("NotExist", "Error");
             }
-            // no access for standard user
-            ViewBag.OnlyAdminManager = await checkAuthorizationSpecificRoleAsync(RoleConstants.Admin) ?? await checkAuthorizationSpecificRoleAsync(RoleConstants.Manager);
-
             return View(prodClass);
         }
@@ -85,23 +62,14 @@
             // check for permission
             UsersClass customerClass = await checkAuthorizationAsync();
-            // set if is authenticated
-            ViewBag.isAuthenticated = await getCrrentUser();
-
             if (customerClass == null)
             {
                 return RedirectToAction("AccessDenied", "Error");
             }
-            // no access for standard user
-            ViewBag.OnlyAdminManager = await checkAuthorizationSpecificRoleAsync(RoleConstants.Admin) ?? await checkAuthorizationSpecificRoleAsync(RoleConstants.Manager);
-
             var model = new ProductsClass
             {
-              //  dateadded = DateTime.Now // Поставете го датумот на моменталниот датум
+                dateadded = DateTime.Now // Поставете го датумот на моменталниот датум
             };
             return View(model);
         }
-
-
-
 
         // POST: Customer/Create
@@ -110,9 +78,9 @@
         [HttpPost]
         [ValidateAntiForgeryToken]
-        public ActionResult Create([Bind(include: "id,name,description,price, is_active, dateadded, category, int available_quantity")] ProductsClass prodClass)
+        public ActionResult Create([Bind(include: "id,name,description,price, is_active, dateadded, category")] ProductsClass prodClass)
         {
             if (ModelState.IsValid)
             {
-              //  prodClass.dateadded = new DateTime();
+                prodClass.dateadded = new DateTime();
                 prodClass.isactive = true;
                 db.ProductObj.Add(prodClass);
@@ -132,7 +100,4 @@
             }
             UsersClass customerClass = await checkAuthorizationAsync();
-            // set if is authenticated
-            ViewBag.isAuthenticated = await getCrrentUser();
-
             if (customerClass == null)
             {
@@ -152,5 +117,5 @@
         [HttpPost]
         [ValidateAntiForgeryToken]
-        public ActionResult Edit([Bind(include: "id,name,description,price, is_active, dateadded, category, int available_quantity")] ProductsClass prodClass)
+        public ActionResult Edit([Bind(include: "id,name,description,price, is_active, dateadded, category")] ProductsClass prodClass)
         {
             if (ModelState.IsValid)
@@ -171,7 +136,4 @@
             }
             UsersClass customerClass = await checkAuthorizationAsync();
-            // set if is authenticated
-            ViewBag.isAuthenticated = await getCrrentUser();
-
             if (customerClass == null)
             {
Index: PostgreSqlDotnetCore/Controllers/VetCenterController.cs
===================================================================
--- PostgreSqlDotnetCore/Controllers/VetCenterController.cs	(revision a3ce071e97bad04f989c769589a31427febe9ff3)
+++ PostgreSqlDotnetCore/Controllers/VetCenterController.cs	(revision 2aea0fddc0f6d0c25f0d44044eeb2ec5930012b9)
@@ -3,8 +3,6 @@
 using Microsoft.EntityFrameworkCore;
 using PostgreSqlDotnetCore.Models;
-using Microsoft.AspNetCore.Mvc.Rendering;
-using System.Threading.Tasks;
-using Npgsql;
-using PostgreSqlDotnetCore.Data;
+using System.Data;
+using System.Net;
 
 namespace PostgreSqlDotnetCore.Controllers
@@ -12,83 +10,16 @@
     public class VetCenterController : BaseController
     {
-        /*  
-         public VetCenterController(UserManager<IdentityUser> userManager) : base(userManager)
-           {
-           }
-        */
-        private readonly ApplicationDbContext db;
-
-        public VetCenterController(UserManager<IdentityUser> userManager, ApplicationDbContext context) : base(userManager)
+        public VetCenterController(UserManager<IdentityUser> userManager) : base(userManager)
         {
-            db = context ?? throw new ArgumentNullException(nameof(context)); 
         }
 
-        public async Task<ActionResult> Create()
+        // GET: Customer
+        public ActionResult Index()
         {
-            // Set if user is authenticated
-            UsersClass customerClass = await checkAuthorizationSpecificRoleAsync(RoleConstants.Admin);
-            ViewBag.isAuthenticated = await getCrrentUser();
-            if (customerClass == null)
-            {
-                return RedirectToAction("AccessDenied", "Error");
-            }
-            // no access for standard user
-            ViewBag.OnlyAdminManager = await checkAuthorizationSpecificRoleAsync(RoleConstants.Admin) ?? await checkAuthorizationSpecificRoleAsync(RoleConstants.Manager);
-
-            // Fetch cities for dropdown
-            var citiess = await db.CitiesObj.ToListAsync();
-            ViewBag.Citiess = new SelectList(citiess, "id", "name");
-
-            return View();
+            return View(db.VetCentersObj.ToList());
         }
 
-        /* public async Task<ActionResult> Index()
-         {
-
-             var vetCenters = await db.VetCentersObj.ToListAsync();
-             ViewBag.isAuthenticated = User.Identity.IsAuthenticated;
-
-             // Check if the user is an admin
-             UsersClass customerClass = await checkAuthorizationSpecificRoleAsync(RoleConstants.Admin);
-             ViewBag.hasAccess = customerClass != null;
-
-             return View(vetCenters);
-         }*/
-        /* public async Task<ActionResult> Index()
-         {
-             var vetCenters = await db.VetCentersObj.ToListAsync();
-             ViewBag.isAuthenticated = User.Identity.IsAuthenticated;
-             // no access for standard user
-             ViewBag.OnlyAdminManager = await checkAuthorizationSpecificRoleAsync(RoleConstants.Admin) ?? await checkAuthorizationSpecificRoleAsync(RoleConstants.Manager);
-
-             // Проверете дали корисникот е администратор или менаџер
-             UsersClass customerClass = await checkAuthorizationSpecificRoleAsync(RoleConstants.Admin);
-             // ?? await checkAuthorizationSpecificRoleAsync(RoleConstants.Manager);
-
-             ViewBag.hasAccess = customerClass != null;
-
-             return View(vetCenters);
-         }
-     */
-        public async Task<ActionResult> Index()
-        {
-            ViewBag.isAuthenticated = await getCrrentUser();
-            ViewBag.hasAccess = await checkAuthorizationAsync();
-            var vetCenters = await db.VetCentersWithCity.ToListAsync(); 
-           // ViewBag.isAuthenticated = User.Identity.IsAuthenticated;
-            // no access for standard user
-            ViewBag.OnlyAdminManager = await checkAuthorizationSpecificRoleAsync(RoleConstants.Admin) ?? await checkAuthorizationSpecificRoleAsync(RoleConstants.Manager);
-
-            
-            UsersClass customerClass = await checkAuthorizationSpecificRoleAsync(RoleConstants.Admin);
-
-            ViewBag.hasAccess = customerClass != null;
-
-            return View(vetCenters);
-        }
-
-
-
-        /*public async Task<ActionResult> Details(int? id)
+        // GET: Customer/Details/5
+        public ActionResult Details(int? id)
         {
             if (id == null)
@@ -96,21 +27,43 @@
                 return RedirectToAction("NotExist", "Error");
             }
-
-            VetCenter vetClass = await db.VetCentersObj.FindAsync(id);
-            UsersClass customerClass = await getCrrentUser();
-            ViewBag.isAuthenticated = customerClass;
+            VetCenter vetClass = db.VetCentersObj.Find(id);
             if (vetClass == null)
             {
                 return RedirectToAction("NotExist", "Error");
             }
-            // no access for standard user
-            ViewBag.OnlyAdminManager = await checkAuthorizationSpecificRoleAsync(RoleConstants.Admin) ?? await checkAuthorizationSpecificRoleAsync(RoleConstants.Manager);
+            return View(vetClass);
+        }
+
+        // GET: Customer/Create
+        public async Task<ActionResult> CreateAsync()
+        {
+            // check for permission
+            UsersClass customerClass = await checkAuthorizationSpecificRoleAsync(RoleConstants.Admin);
+            if (customerClass == null)
+            {
+                return RedirectToAction("AccessDenied", "Error");
+            }
+            return View();
+        }
+
+        // POST: Customer/Create
+        // To protect from overposting attacks, enable the specific properties you want to bind to, for 
+        // more details see https://go.microsoft.com/fwlink/?LinkId=317598.
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        public ActionResult Create([Bind(include: "id,name,adress,description,workinghours,phonenumber,latitude,longitude,citiesid")] VetCenter vetClass)
+        {
+            if (ModelState.IsValid)
+            {
+                db.VetCentersObj.Add(vetClass);
+                db.SaveChanges();
+                return RedirectToAction("Index");
+            }
 
             return View(vetClass);
         }
 
-
-       */
-        public async Task<IActionResult> Details(int? id)
+        // GET: Customer/Edit/5
+        public async Task<ActionResult> EditAsync(int? id)
         {
             if (id == null)
@@ -118,97 +71,36 @@
                 return RedirectToAction("NotExist", "Error");
             }
-
-            // Логирајте го ID-то за дебугирање
-            Console.WriteLine($"ID: {id}");
-
-            // Обидете се да најдете запис во view
-            VetCenterWithCity vetClass = await db.VetCentersWithCity
-                                                 .Where(v => v.id == id) 
-                                                 .FirstOrDefaultAsync();
+            VetCenter vetClass = db.VetCentersObj.Find(id);
             if (vetClass == null)
             {
                 return RedirectToAction("NotExist", "Error");
             }
-
-            
-            UsersClass customerClass = await getCrrentUser();
-            ViewBag.isAuthenticated = customerClass;
-
-           
+            // check for permission
+            UsersClass customerClass = await checkAuthorizationSpecificRoleAsync(RoleConstants.Admin);
+            if (customerClass == null)
+            {
+                return RedirectToAction("AccessDenied", "Error");
+            }
             return View(vetClass);
         }
 
-
-
-
-
-
-
-
-
-
-
-
+        // POST: Customer/Edit/5
+        // To protect from overposting attacks, enable the specific properties you want to bind to, for 
+        // more details see https://go.microsoft.com/fwlink/?LinkId=317598.
         [HttpPost]
         [ValidateAntiForgeryToken]
-        public async Task<ActionResult> Create([Bind(include: "id,name,adress,description,workinghours,phonenumber,latitude,longitude,citiesid")] VetCenter vetClass)
+        public ActionResult Edit([Bind(include: "id,name,adress,description,workinghours,phonenumber,latitude,longitude,citiesid")] VetCenter vetClass)
         {
             if (ModelState.IsValid)
             {
-                db.VetCentersObj.Add(vetClass);
-                await db.SaveChangesAsync();
+                db.Entry(vetClass).State = EntityState.Modified;
+                db.SaveChanges();
                 return RedirectToAction("Index");
             }
-
-            // If model is invalid, repopulate the cities for dropdown
-            var citiess = await db.CitiesObj.ToListAsync();
-            ViewBag.Citiess = new SelectList(citiess, "id", "name", vetClass.citiesid);
-
             return View(vetClass);
         }
 
-   
-
-         /*public async Task<ActionResult> Create([Bind(include: "id,name,adress,description,workinghours,phonenumber,latitude,longitude,citiesid")] VetCenter vetClass)
-         {
-             // Логирање на параметрите
-             Console.WriteLine($"Parameters: {vetClass.name}, {vetClass.adress}, {vetClass.description}, {vetClass.workinghours}, {vetClass.phonenumber}, {vetClass.latitude}, {vetClass.longitude}, {vetClass.citiesid}");
-
-             if (ModelState.IsValid)
-             {
-                 // Повик на складираната процедура
-                 var parameters = new[]
-                 {
-             new NpgsqlParameter("@name", vetClass.name),
-             new NpgsqlParameter("@adress", vetClass.adress),
-             new NpgsqlParameter("@description", vetClass.description),
-             new NpgsqlParameter("@workinghours", vetClass.workinghours),
-             new NpgsqlParameter("@phonenumber", vetClass.phonenumber),
-             new NpgsqlParameter("@latitude", (decimal)vetClass.latitude),
-             new NpgsqlParameter("@longitude", (decimal)vetClass.longitude),
-             new NpgsqlParameter("@citiesid", vetClass.citiesid)
-         };
-
-                 await db.Database.ExecuteSqlRawAsync("CALL project.AddVetCenter(@name, @adress, @description, @workinghours, @phonenumber, @latitude, @longitude, @citiesid)", parameters);
-
-                 return RedirectToAction("Index");
-             }
-
-             // Ако моделот не е валиден, повторно пополнете ги градовите за паѓачкиот мени
-             var citiess = await db.CitiesObj.ToListAsync();
-             ViewBag.Citiess = new SelectList(citiess, "id", "name", vetClass.citiesid);
-
-             return View(vetClass);
-         }
-
-         
-
-
-        */
-
-
-
-
-        public async Task<ActionResult> Edit(int? id)
+        // GET: Customer/Delete/5
+        public ActionResult Delete(int? id)
         {
             if (id == null)
@@ -216,76 +108,20 @@
                 return RedirectToAction("NotExist", "Error");
             }
-
-            VetCenter vetClass = await db.VetCentersObj.FindAsync(id);
+            VetCenter vetClass = db.VetCentersObj.Find(id);
             if (vetClass == null)
             {
                 return RedirectToAction("NotExist", "Error");
             }
-
-            // Check for permission
-            UsersClass customerClass = await checkAuthorizationSpecificRoleAsync(RoleConstants.Admin);
-            //UsersClass customerClass = await checkAuthorizationAsync();
-            ViewBag.isAuthenticated = await getCrrentUser();
-            if (customerClass == null)
-            {
-                return RedirectToAction("AccessDenied", "Error");
-            }
-            ViewBag.OnlyAdminManager = await checkAuthorizationSpecificRoleAsync(RoleConstants.Admin) ?? await checkAuthorizationSpecificRoleAsync(RoleConstants.Manager);
-
-
-            // Fetch cities for dropdown
-            var citiess = await db.CitiesObj.ToListAsync();
-            ViewBag.Citiess = new SelectList(citiess, "id", "name", vetClass.citiesid);
-
             return View(vetClass);
         }
 
-        [HttpPost]
-        [ValidateAntiForgeryToken]
-        public async Task<ActionResult> Edit([Bind(include: "id,name,adress,description,workinghours,phonenumber,latitude,longitude,citiesid")] VetCenter vetClass)
-        {
-            if (ModelState.IsValid)
-            {
-                db.Entry(vetClass).State = EntityState.Modified;
-                await db.SaveChangesAsync();
-                return RedirectToAction("Index");
-            }
-
-            // If model is invalid, repopulate the cities for dropdown
-            var citiess = await db.CitiesObj.ToListAsync();
-            ViewBag.Citiess = new SelectList(citiess, "id", "name", vetClass.citiesid);
-
-            return View(vetClass);
-        }
-
-        public async Task<ActionResult> Delete(int? id)
-        {
-            UsersClass customerClass = await checkAuthorizationAsync();
-
-            ViewBag.isAuthenticated = await getCrrentUser();
-
-            if (id == null)
-            {
-                return RedirectToAction("NotExist", "Error");
-            }
-
-            VetCenter vetClass = await db.VetCentersObj.FindAsync(id);
-            if (vetClass == null)
-            {
-                return RedirectToAction("NotExist", "Error");
-            }
-            ViewBag.OnlyAdminManager = await checkAuthorizationSpecificRoleAsync(RoleConstants.Admin) ?? await checkAuthorizationSpecificRoleAsync(RoleConstants.Manager);
-
-
-            return View(vetClass);
-        }
-
+        // POST: Customer/Delete/5
         [HttpPost, ActionName("Delete")]
         [ValidateAntiForgeryToken]
-        public async Task<ActionResult> DeleteConfirmed(int id)
+        public ActionResult DeleteConfirmed(int id)
         {
-            VetCenter vetClass = await db.VetCentersObj.FindAsync(id);
+            VetCenter vetClass = db.VetCentersObj.Find(id);
             db.VetCentersObj.Remove(vetClass);
-            await db.SaveChangesAsync();
+            db.SaveChanges();
             return RedirectToAction("Index");
         }
@@ -300,17 +136,22 @@
         }
 
-        public async Task<ActionResult> IndexWithSearch(string searchTerm)
+
+        // GET: VetCenter/Search
+        public ActionResult IndexWithSearch(string searchTerm)
         {
             if (string.IsNullOrEmpty(searchTerm))
             {
-                var vetCenters = await db.VetCentersObj.ToListAsync();
+                var vetCenters = db.VetCentersObj.ToList();
                 return View(vetCenters);
             }
             else
             {
-                var searchResults = await db.VetCentersObj.Where(vc => vc.name.Contains(searchTerm)).ToListAsync();
+                var searchResults = db.VetCentersObj.Where(vc => vc.name.Contains(searchTerm)).ToList();
                 return View(searchResults);
             }
         }
+
+
+
     }
 }
Index: PostgreSqlDotnetCore/Data/ApplicationDbContext.cs
===================================================================
--- PostgreSqlDotnetCore/Data/ApplicationDbContext.cs	(revision a3ce071e97bad04f989c769589a31427febe9ff3)
+++ PostgreSqlDotnetCore/Data/ApplicationDbContext.cs	(revision 2aea0fddc0f6d0c25f0d44044eeb2ec5930012b9)
@@ -50,20 +50,6 @@
             modelBuilder.Entity<Pet_GaleryClass>().Metadata.SetIsTableExcludedFromMigrations(true);
             modelBuilder.Entity<BlogPostAnswers>().Metadata.SetIsTableExcludedFromMigrations(true);
-
-            modelBuilder.Entity<PetDetailsProcedure>().Metadata.SetIsTableExcludedFromMigrations(true);
             //modelBuilder.Entity<PetCareAllData>().Metadata.SetIsTableExcludedFromMigrations(true);
-
-            // додадени следните два реда на 28.08
-            // modelBuilder.Entity<VetCenterWithCity>().HasNoKey(); // Дефинирајте дека VIEW-от нема примарен клуч
-            // modelBuilder.Entity<VetCenterWithCity>().ToView("vet_centers_with_city"); // Поставете го името на VIEW-от
-            modelBuilder.Entity<VetCenterWithCity>().HasNoKey().ToView("vet_centers_with_city");
             base.OnModelCreating(modelBuilder);
-
-
-            modelBuilder.Entity<BlogUsers>().HasNoKey().ToView("view_userss_consultationss");
-            base.OnModelCreating(modelBuilder);
-            // Configure the relationship between VetCenter and CitiesClass
-
-
 
             // ... model definition ...
@@ -72,9 +58,4 @@
         public virtual DbSet<UsersClass> CustomerObj { get; set; }
         public virtual DbSet<VetCenter> VetCentersObj { get; set; }
-        
-        // додадено на 28.08
-        public virtual DbSet<VetCenterWithCity> VetCentersWithCity { get; set; }
-
-        public virtual DbSet<BlogUsers> BlogUsers { get; set; }
         public virtual DbSet<BlogPostConsultation> BlogPostControllerObj { get; set; }
         public virtual DbSet<RolesClass> RoleControllerObj { get; set; }
@@ -95,9 +76,4 @@
         public virtual DbSet<TherapyClass> theraObj { get; set; }
         public virtual DbSet<Type_Of_PetsClass> typeofObj { get; set; }
-        
-        public virtual DbSet<PetDetailsProcedure> PetDetailsProcedureObj { get; set; }
-
-        //public virtual DbSet<PetDetailsProcedure> AddVetCenter { get; set; }
-
     }
 }
Index: PostgreSqlDotnetCore/Models/ApplicationDbContext.cs
===================================================================
--- PostgreSqlDotnetCore/Models/ApplicationDbContext.cs	(revision a3ce071e97bad04f989c769589a31427febe9ff3)
+++ 	(revision )
@@ -1,11 +1,0 @@
-﻿// File: Models/ActiveProductsView.cs
-
-namespace PostgreSqlDotnetCore.Models
-{
-    public class ActiveProductsView
-    {
-        public string Name { get; set; }
-        public string Description { get; set; }
-        public decimal Price { get; set; }
-    }
-}
Index: PostgreSqlDotnetCore/Models/BlogPostAnswers.cs
===================================================================
--- PostgreSqlDotnetCore/Models/BlogPostAnswers.cs	(revision a3ce071e97bad04f989c769589a31427febe9ff3)
+++ PostgreSqlDotnetCore/Models/BlogPostAnswers.cs	(revision 2aea0fddc0f6d0c25f0d44044eeb2ec5930012b9)
@@ -12,14 +12,6 @@
         public int parent_id { get; set; }
         public string reply { get; set; }
-
-        [ForeignKey("BlogPostConsultation")]
-        [Column("blogpostconsid")]
-        public int BlogPostConsultationid { get; set; }
-        public BlogPostConsultation BlogPostConsultation { get; set; }
-
+        public int? blogpostconsultationid { get; set; }
         public int usersid { get; set; }
-
-        [NotMapped]
-        public List<BlogPostAnswers> blogPostAnswers{ get; set; }
     }
 }
Index: PostgreSqlDotnetCore/Models/BlogPostConsultation.cs
===================================================================
--- PostgreSqlDotnetCore/Models/BlogPostConsultation.cs	(revision a3ce071e97bad04f989c769589a31427febe9ff3)
+++ PostgreSqlDotnetCore/Models/BlogPostConsultation.cs	(revision 2aea0fddc0f6d0c25f0d44044eeb2ec5930012b9)
@@ -15,6 +15,6 @@
         //public DateTime date_askes { get; set; }
         //public DateTime date_askes { get; set; } = DateTime.UtcNow.Date;
-        public DateOnly date_askes { get; set; } = DateOnly.FromDateTime(DateTime.Now);
-        
+        public DateOnly date_askes { get; set; } = DateOnly.FromDateTime(DateTime.UtcNow);
+
         public string title { get; set; }
        
Index: PostgreSqlDotnetCore/Models/BlogUsers.cs
===================================================================
--- PostgreSqlDotnetCore/Models/BlogUsers.cs	(revision a3ce071e97bad04f989c769589a31427febe9ff3)
+++ 	(revision )
@@ -1,17 +1,0 @@
-﻿// File: Models/VetCenterWithCity.cs
-
-namespace PostgreSqlDotnetCore.Models
-{
-    public class BlogUsers
-    {
-        public int id { get; set; }
-        public int users_id { get; set; }
-        public string user_name { get; set; }
-        public string user_lastname { get; set; }
-        public string user_email { get; set; } // Додајте име на градот
-        public string consultation_title { get; set; }
-        public string consultation_description { get; set; }
-        public DateOnly consultation_date { get; set; }
-
-    }
-}
Index: PostgreSqlDotnetCore/Models/PetDetailsProcedure.cs
===================================================================
--- PostgreSqlDotnetCore/Models/PetDetailsProcedure.cs	(revision a3ce071e97bad04f989c769589a31427febe9ff3)
+++ 	(revision )
@@ -1,16 +1,0 @@
-﻿namespace PostgreSqlDotnetCore.Models
-{
-    using System.ComponentModel.DataAnnotations;
-
-    public class PetDetailsProcedure
-    {
-        [Key]
-        public int pet_id { get; set; }
-        public string pet_name { get; set; }
-        public string diagnosis_description { get; set; }
-        public string medicine_name { get; set; }
-        public string medicine_description { get; set; }
-        public string therapy_description { get; set; }
-        public DateTime therapy_date { get; set; }
-    }
-}
Index: PostgreSqlDotnetCore/Models/Pet_CaresClass.cs
===================================================================
--- PostgreSqlDotnetCore/Models/Pet_CaresClass.cs	(revision a3ce071e97bad04f989c769589a31427febe9ff3)
+++ PostgreSqlDotnetCore/Models/Pet_CaresClass.cs	(revision 2aea0fddc0f6d0c25f0d44044eeb2ec5930012b9)
@@ -19,18 +19,4 @@
         public string description { get; set; }
         public DateTime dateending { get; set; }
-
-        public DateTime start_date { get; set; }
-
-        [ForeignKey("PetsClass")]
-        [Column("pet_id")]
-        public int pet_id { get; set; }
-        public PetsClass PetsClass { get; set; }
-
-
-        public void SetDatesToUtc()
-        {
-            dateending = DateTime.SpecifyKind(dateending, DateTimeKind.Utc);
-            start_date = DateTime.SpecifyKind(start_date, DateTimeKind.Utc);
-        }
         public int usersid { get; set; }
         public int vetcentersid { get; set; }
Index: PostgreSqlDotnetCore/Models/Pet_care_appointments.cs
===================================================================
--- PostgreSqlDotnetCore/Models/Pet_care_appointments.cs	(revision a3ce071e97bad04f989c769589a31427febe9ff3)
+++ 	(revision )
@@ -1,17 +1,0 @@
-﻿// File: Models/VetCenterWithCity.cs
-
-namespace PostgreSqlDotnetCore.Models
-{
-    public class Pet_care_appointments
-    {
-        public int id { get; set; }
-        public string user_name { get; set; }
-        public string vet_center_name { get; set; }
-        public string user_lastname { get; set; }
-        public PetsClass PetsClass { get; set; }
-        public string pet_care_title { get; set; } 
-        public DateTime starttt_date { get; set; }
-        public DateTime appointment_date { get; set; }
-      
-    }
-}
Index: PostgreSqlDotnetCore/Models/PetsClass.cs
===================================================================
--- PostgreSqlDotnetCore/Models/PetsClass.cs	(revision a3ce071e97bad04f989c769589a31427febe9ff3)
+++ PostgreSqlDotnetCore/Models/PetsClass.cs	(revision 2aea0fddc0f6d0c25f0d44044eeb2ec5930012b9)
@@ -16,6 +16,4 @@
         public string color { get; set; }
 
-        public string name { get; set; }
-
         public string description { get; set; }
        // public DateTime dateofbirthday { get; set; }
Index: PostgreSqlDotnetCore/Models/ProductsClass.cs
===================================================================
--- PostgreSqlDotnetCore/Models/ProductsClass.cs	(revision a3ce071e97bad04f989c769589a31427febe9ff3)
+++ PostgreSqlDotnetCore/Models/ProductsClass.cs	(revision 2aea0fddc0f6d0c25f0d44044eeb2ec5930012b9)
@@ -19,11 +19,7 @@
         public string price { get; set; }
         public bool isactive { get; set; }
-        //public DateTime dateadded { get; set; }
-
-        public DateOnly dateadded { get; set; } = DateOnly.FromDateTime(DateTime.UtcNow);
+        public DateTime dateadded { get; set; }
         public string category { get; set; }
-
-        public int  available_quantity { get; set; }
-
+        
 
     }
Index: PostgreSqlDotnetCore/Models/VetCenter.cs
===================================================================
--- PostgreSqlDotnetCore/Models/VetCenter.cs	(revision a3ce071e97bad04f989c769589a31427febe9ff3)
+++ PostgreSqlDotnetCore/Models/VetCenter.cs	(revision 2aea0fddc0f6d0c25f0d44044eeb2ec5930012b9)
@@ -9,8 +9,8 @@
 namespace PostgreSqlDotnetCore.Models
 {
-    [Table("vet_centers_with_city", Schema = "project")]
+    [Table("vet_centers", Schema = "project")]
     public class VetCenter
     {
-       // [Key]
+        [Key]
         public int id { get; set; }
 
@@ -24,7 +24,5 @@
         public float longitude { get; set; }
         public string phonenumber { get; set; }
-       // [ForeignKey("CitiesClass")]
         public int citiesid { get; set; }
-       // public CitiesClass CitiesClass { get; set; }
 
 
Index: PostgreSqlDotnetCore/Models/VetCenterWithCity.cs
===================================================================
--- PostgreSqlDotnetCore/Models/VetCenterWithCity.cs	(revision a3ce071e97bad04f989c769589a31427febe9ff3)
+++ 	(revision )
@@ -1,17 +1,0 @@
-﻿// File: Models/VetCenterWithCity.cs
-
-namespace PostgreSqlDotnetCore.Models
-{
-    public class VetCenterWithCity
-    {
-        public int id { get; set; }
-        public string vet_center_name { get; set; }
-        public string adress { get; set; }
-        public string city_name { get; set; } // Додајте име на градот
-        public string description { get; set; }
-        public string workinghours { get; set; }
-        public float latitude { get; set; }
-        public float longitude { get; set; }
-        public string phonenumber { get; set; }
-    }
-}
Index: PostgreSqlDotnetCore/PostgreSqlDotnetCore.csproj
===================================================================
--- PostgreSqlDotnetCore/PostgreSqlDotnetCore.csproj	(revision a3ce071e97bad04f989c769589a31427febe9ff3)
+++ PostgreSqlDotnetCore/PostgreSqlDotnetCore.csproj	(revision 2aea0fddc0f6d0c25f0d44044eeb2ec5930012b9)
@@ -70,5 +70,5 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="7.0.12" />
+    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="7.0.11" />
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="7.0.1" />
   </ItemGroup>
Index: PostgreSqlDotnetCore/Program.cs
===================================================================
--- PostgreSqlDotnetCore/Program.cs	(revision a3ce071e97bad04f989c769589a31427febe9ff3)
+++ PostgreSqlDotnetCore/Program.cs	(revision 2aea0fddc0f6d0c25f0d44044eeb2ec5930012b9)
@@ -2,5 +2,4 @@
 using Microsoft.EntityFrameworkCore;
 using PostgreSqlDotnetCore.Data;
-using PostgreSqlDotnetCore.Models;
 
 var builder = WebApplication.CreateBuilder(args);
Index: PostgreSqlDotnetCore/Views/Blog/Create.cshtml
===================================================================
--- PostgreSqlDotnetCore/Views/Blog/Create.cshtml	(revision a3ce071e97bad04f989c769589a31427febe9ff3)
+++ PostgreSqlDotnetCore/Views/Blog/Create.cshtml	(revision 2aea0fddc0f6d0c25f0d44044eeb2ec5930012b9)
@@ -17,5 +17,5 @@
         @Html.ValidationSummary(true, "", new { @class = "text-danger" })
 
-       @* <div class="form-group">
+        <div class="form-group">
             @Html.LabelFor(model => model.date_askes, htmlAttributes: new { @class = "control-label col-md-2" })
             <div class="col-md-10">
@@ -24,18 +24,4 @@
             </div>
         </div>
-        *@
-      @*  <div class="form-group">
-            @Html.LabelFor(model => model.date_askes, htmlAttributes: new { @class = "control-label col-md-2" })
-            <div class="col-md-10">
-                @Html.EditorFor(model => model.date_askes, new { htmlAttributes = new { @class = "form-control", @type = "date", value = DateTime.UtcNow.ToString("yyyy-MM-dd") } })
-                @Html.ValidationMessageFor(model => model.date_askes, "", new { @class = "text-danger" })
-            </div>
-        </div>
-        *@
-
-       
-
-
-       
 
         <div class="form-group">
Index: PostgreSqlDotnetCore/Views/Blog/Details.cshtml
===================================================================
--- PostgreSqlDotnetCore/Views/Blog/Details.cshtml	(revision a3ce071e97bad04f989c769589a31427febe9ff3)
+++ PostgreSqlDotnetCore/Views/Blog/Details.cshtml	(revision 2aea0fddc0f6d0c25f0d44044eeb2ec5930012b9)
@@ -5,8 +5,8 @@
 }
 
-@*<h2>Одговори</h2>*@
-@*
+<h2>Details</h2>
+
 <div>
-   <h4>Blog post for consultations</h4>
+    <h4>Blog post for consultations</h4>
     <hr />
     <dl class="dl-horizontal">
@@ -33,5 +33,4 @@
             @Html.DisplayFor(model => model.description)
         </dd>
-        
         <dt>
             @Html.DisplayNameFor(model => model.users_id)
@@ -42,12 +41,9 @@
         </dd>
 
-
     </dl>
 </div>
-*@
-
 <hr/>
 <div>
-    <h2>Answers</h2>
+    <h4>Blog post anwers</h4>
     <hr />
 
@@ -77,22 +73,8 @@
 
                 <td>
-                  
-                    @Html.ActionLink("Details", "Details", "BlogPostAnswers", new { id = item.id }) 
-                    @Html.ActionLink("Create an Answer", "Create", "BlogPostAnswers", new { id = item.BlogPostConsultationid, parentId = item.id })
+                    @Html.ActionLink("Edit", "Edit", "BlogPostAnswers", new { id = item.id }) |
+                    @Html.ActionLink("Details", "Details", "BlogPostAnswers", new { id = item.id }) |
+                    @Html.ActionLink("Delete", "Delete", "BlogPostAnswers", new { id = item.id })
                 </td>
-
-                @if (item.usersid == ViewBag.CurrentUserId)
-
-                {
-                    <td>
-                       
-                        @Html.ActionLink("Edit", "Edit", "BlogPostAnswers", new { id = item.id })
-                        @Html.ActionLink("Delete", "Delete", "BlogPostAnswers", new { id = item.id })
-                        
-
-                    </td>
-                }
-
-
             </tr>
         }
@@ -101,16 +83,5 @@
 </div>
 <p>
-    @Html.ActionLink("Create an Answer", "Create", "BlogPostAnswers", new { id = Model.id, parentId = Model.id })
+    @Html.ActionLink("Edit", "Edit", new { id = Model.id }) |
     @Html.ActionLink("Back to List", "Index")
 </p>
-
-
-@if (Model.users_id == ViewBag.CurrentUserId)
-
-{
-    <p>
-        @Html.ActionLink("Edit", "Edit", new { id = Model.id })
-       
-
-    </p>
-}
Index: PostgreSqlDotnetCore/Views/Blog/Edit.cshtml
===================================================================
--- PostgreSqlDotnetCore/Views/Blog/Edit.cshtml	(revision a3ce071e97bad04f989c769589a31427febe9ff3)
+++ PostgreSqlDotnetCore/Views/Blog/Edit.cshtml	(revision 2aea0fddc0f6d0c25f0d44044eeb2ec5930012b9)
@@ -41,5 +41,5 @@
         </div>
     </div>
-    @*<div class="form-group">
+    <div class="form-group">
         @Html.LabelFor(model => model.users_id, htmlAttributes: new { @class = "control-label col-md-2" })
         <div class="col-md-10">
@@ -48,5 +48,5 @@
         </div>
     </div>
-    *@
+
     <div class="form-group">
         <div class="col-md-offset-2 col-md-10">
Index: PostgreSqlDotnetCore/Views/Blog/Index.cshtml
===================================================================
--- PostgreSqlDotnetCore/Views/Blog/Index.cshtml	(revision a3ce071e97bad04f989c769589a31427febe9ff3)
+++ PostgreSqlDotnetCore/Views/Blog/Index.cshtml	(revision 2aea0fddc0f6d0c25f0d44044eeb2ec5930012b9)
@@ -1,3 +1,3 @@
-﻿@model IEnumerable<PostgreSqlDotnetCore.Models.BlogUsers>
+﻿@model IEnumerable<PostgreSqlDotnetCore.Models.BlogPostConsultation>
 
 @{
@@ -14,20 +14,14 @@
 
         <th>
-            @Html.DisplayNameFor(model => model.id)
+            @Html.DisplayNameFor(model => model.date_askes)
         </th>
         <th>
-            @Html.DisplayNameFor(model => model.user_name)
+            @Html.DisplayNameFor(model => model.title)
         </th>
         <th>
-            @Html.DisplayNameFor(model => model.user_email)
+            @Html.DisplayNameFor(model => model.description)
         </th>
         <th>
-            @Html.DisplayNameFor(model => model.consultation_title)
-        </th>
-        <th>
-            @Html.DisplayNameFor(model => model.consultation_description)
-        </th>
-        <th>
-            @Html.DisplayNameFor(model => model.consultation_date)
+            @Html.DisplayNameFor(model => model.users_id)
         </th>
         <th></th>
@@ -35,65 +29,27 @@
     </tr>
 
-    @foreach (var item in Model)
-    {
-        <tr>
-            <td>
-                @Html.DisplayFor(modelItem => item.id)
-            </td>
-            <td>
-                @Html.DisplayFor(modelItem => item.user_name)
-            </td>
-            <td>
-                @Html.DisplayFor(model => item.user_email)
-            </td>
-            <td>
-                @Html.DisplayFor(modelItem => item.consultation_title)
-            </td>
-            <td>
-                @Html.DisplayFor(modelItem => item.consultation_description)
-            </td>
-            <td>
-                @Html.DisplayFor(modelItem => item.consultation_date)
-            </td>
+@foreach (var item in Model) {
+    <tr>
+        <td>
+            @Html.DisplayFor(modelItem => item.date_askes)
+        </td>
+        <td>
+            @Html.DisplayFor(modelItem => item.title)
+        </td>
 
-            @*<td>
-        @Html.ActionLink("Edit", "Edit", new { id = item.id }) |
-        @Html.ActionLink("Answers", "Details", new { id = item.id }) |
-        @Html.ActionLink("Delete", "Delete", new { id = item.id })
+        <td>
+            @Html.DisplayFor(modelItem => item.description)
         </td>
-        *@
+        <th>
+            @Html.DisplayFor(model => item.users_id)
+        </th>
 
-
-
-
-            @if (item.users_id == ViewBag.CurrentUserId)
-                
-            {
-                <td>
-                    @Html.ActionLink("Edit", "Edit", new { id = item.id })
-                    @Html.ActionLink("Delete", "Delete", new { id = item.id })
-
-                </td>
-            }
-            
-          
-
-            @if (item.users_id == ViewBag.CurrentUserId || item.users_id != ViewBag.CurrentUserId)
-            {
-                <td>
-
-                    @Html.ActionLink("Answers", "Details", new { id = item.id })
-
-
-                </td>
-            }
-
-
-
-
-
-
-        </tr>
-    }
+        <td>
+            @Html.ActionLink("Edit", "Edit", new { id = item.id }) |
+            @Html.ActionLink("Details", "Details", new { id = item.id }) |
+            @Html.ActionLink("Delete", "Delete", new { id = item.id })
+        </td>
+    </tr>
+}
 
 </table>
Index: PostgreSqlDotnetCore/Views/BlogPostAnswers/Create.cshtml
===================================================================
--- PostgreSqlDotnetCore/Views/BlogPostAnswers/Create.cshtml	(revision a3ce071e97bad04f989c769589a31427febe9ff3)
+++ PostgreSqlDotnetCore/Views/BlogPostAnswers/Create.cshtml	(revision 2aea0fddc0f6d0c25f0d44044eeb2ec5930012b9)
@@ -17,5 +17,5 @@
     @Html.ValidationSummary(true, "", new { @class = "text-danger" })
 
-   @*  <div class="form-group">
+    <div class="form-group">
         @Html.LabelFor(model => model.parent_id, htmlAttributes: new { @class = "control-label col-md-2" })
         <div class="col-md-10">
@@ -24,5 +24,5 @@
         </div>
     </div>
- *@
+
     <div class="form-group">
         @Html.LabelFor(model => model.reply, htmlAttributes: new { @class = "control-label col-md-2" })
Index: PostgreSqlDotnetCore/Views/BlogPostAnswers/Details.cshtml
===================================================================
--- PostgreSqlDotnetCore/Views/BlogPostAnswers/Details.cshtml	(revision a3ce071e97bad04f989c769589a31427febe9ff3)
+++ PostgreSqlDotnetCore/Views/BlogPostAnswers/Details.cshtml	(revision 2aea0fddc0f6d0c25f0d44044eeb2ec5930012b9)
@@ -29,39 +29,6 @@
     </dl>
 </div>
-<br/>
-@{
-    if(Model.blogPostAnswers.Count > 0)
-    {
-
-        <h4>Replay under Answers</h4>
-        <hr />
-        foreach (BlogPostAnswers item in Model.blogPostAnswers)
-        {
-
-            <dl class="dl-horizontal">
-                <dt>
-                    @Html.DisplayNameFor(model => item.parent_id)
-                </dt>
-
-                <dd>
-                    @Html.DisplayFor(model => item.parent_id)
-                </dd>
-
-                <dt>
-                    @Html.DisplayNameFor(model => item.reply)
-                </dt>
-                <dd>
-                    @Html.DisplayFor(model => item.reply)
-                </dd>
-
-
-            </dl>
-        }
-        <hr />
-    }
-}
 <p>
     @Html.ActionLink("Edit", "Edit", new { id = Model.id }) |
-    @* @Html.ActionLink("Back to List", "Index") *@
-    <a href="javascript:void(0);" onclick="history.go(-1);">Back to List</a>
+    @Html.ActionLink("Back to List", "Index")
 </p>
Index: PostgreSqlDotnetCore/Views/City/Index.cshtml
===================================================================
--- PostgreSqlDotnetCore/Views/City/Index.cshtml	(revision a3ce071e97bad04f989c769589a31427febe9ff3)
+++ PostgreSqlDotnetCore/Views/City/Index.cshtml	(revision 2aea0fddc0f6d0c25f0d44044eeb2ec5930012b9)
@@ -16,24 +16,23 @@
             @Html.DisplayNameFor(model => model.name)
         </th>
-
+    
         <th></th>
 
     </tr>
 
-    @foreach (var item in Model)
-    {
-        <tr>
-            <td>
-                @Html.DisplayFor(modelItem => item.name)
-            </td>
+@foreach (var item in Model) {
+    <tr>
+        <td>
+            @Html.DisplayFor(modelItem => item.name)
+        </td>
+     
 
-
-            <td>
-                @Html.ActionLink("Edit", "Edit", new { id = item.id }) |
-                @Html.ActionLink("Details", "Details", new { id = item.id }) |
-                @Html.ActionLink("Delete", "Delete", new { id = item.id })
-            </td>
-        </tr>
-    }
+        <td>
+            @Html.ActionLink("Edit", "Edit", new { id = item.id }) |
+            @Html.ActionLink("Details", "Details", new { id = item.id }) |
+            @Html.ActionLink("Delete", "Delete", new { id = item.id })
+        </td>
+    </tr>
+}
 
 </table>
Index: PostgreSqlDotnetCore/Views/Customer/Index.cshtml
===================================================================
--- PostgreSqlDotnetCore/Views/Customer/Index.cshtml	(revision a3ce071e97bad04f989c769589a31427febe9ff3)
+++ PostgreSqlDotnetCore/Views/Customer/Index.cshtml	(revision 2aea0fddc0f6d0c25f0d44044eeb2ec5930012b9)
@@ -17,15 +17,7 @@
     {
 
-       /* <p>
+        <p>
             @Html.ActionLink("Create New", "Create")
         </p>
-        */
-
-        @if (ViewBag.CanCreate)
-        {
-            <p>
-                @Html.ActionLink("Create New", "Create")
-            </p>
-        }
         <table class="table">
             <tr>
Index: PostgreSqlDotnetCore/Views/PetCares/Create.cshtml
===================================================================
--- PostgreSqlDotnetCore/Views/PetCares/Create.cshtml	(revision a3ce071e97bad04f989c769589a31427febe9ff3)
+++ PostgreSqlDotnetCore/Views/PetCares/Create.cshtml	(revision 2aea0fddc0f6d0c25f0d44044eeb2ec5930012b9)
@@ -30,11 +30,4 @@
         </div>
     </div>
-        <div class="form-group">
-            @Html.LabelFor(model => model.start_date, htmlAttributes: new { @class = "control-label col-md-2" })
-            <div class="col-md-10">
-                @Html.EditorFor(model => model.start_date, new { htmlAttributes = new { @class = "form-control" } })
-                @Html.ValidationMessageFor(model => model.start_date, "", new { @class = "text-danger" })
-            </div>
-        </div>
     <div class="form-group">
         @Html.LabelFor(model => model.dateending, htmlAttributes: new { @class = "control-label col-md-2" })
@@ -44,5 +37,4 @@
         </div>
     </div>
-    
 
 
@@ -54,5 +46,4 @@
         </div>
     </div> *@
-    @*
         <div class="form-group">
             <label class="control-label col-md-2" for="vetcentersid">VetCenter:</label>
@@ -60,25 +51,11 @@
                 <select class="form-control" id="vetcentersid" name="vetcentersid">
                     <option value="">Select VetCenter</option>
-                    <option value="4">Vet Svet</option>
-                    <option value="5">Veterinarian Ambulance - Dr.Tonit</option>
-                    <option value="6">Vet In</option>
+                    <option value="1">Vet Svet</option>
+                    <option value="2">Veterinarian Ambulance - Dr.Tonit</option>
+                    <option value="4">Vet In</option>
                 </select>
             </div>
         </div>
-        *@
 
-        <div class="form-group">
-            <label class="control-label col-md-2" for="vetcentersid">VetCenter:</label>
-            <div class="col-md-10">
-                @Html.DropDownList("vetcentersid", (SelectList)ViewBag.VetCenters, "Select VetCenter", new { @class = "form-control" })
-            </div>
-        </div>
-
-        <div class="form-group">
-            <label class="control-label col-md-2" for="pet_id">UserPet:</label>
-            <div class="col-md-10">
-                @Html.DropDownList("pet_id", (SelectList)ViewBag.Pets, "Select Pets", new { @class = "form-control" })
-            </div>
-        </div>
 
 
Index: PostgreSqlDotnetCore/Views/PetCares/Delete.cshtml
===================================================================
--- PostgreSqlDotnetCore/Views/PetCares/Delete.cshtml	(revision a3ce071e97bad04f989c769589a31427febe9ff3)
+++ PostgreSqlDotnetCore/Views/PetCares/Delete.cshtml	(revision 2aea0fddc0f6d0c25f0d44044eeb2ec5930012b9)
@@ -19,10 +19,6 @@
         </dt>
         <dt>
-            @Html.DisplayNameFor(model => model.start_date)
-        </dt>
-        <dt>
             @Html.DisplayNameFor(model => model.dateending)
         </dt>
-       
         <dt>
             @Html.DisplayNameFor(model => model.usersid)
@@ -40,10 +36,6 @@
         </dd>
         <dd>
-            @Html.DisplayFor(model => model.start_date)
-        </dd>
-        <dd>
             @Html.DisplayFor(model => model.dateending)
         </dd>
-       
         <dd>
             @Html.DisplayFor(model => model.usersid)
Index: PostgreSqlDotnetCore/Views/PetCares/Details.cshtml
===================================================================
--- PostgreSqlDotnetCore/Views/PetCares/Details.cshtml	(revision a3ce071e97bad04f989c769589a31427febe9ff3)
+++ PostgreSqlDotnetCore/Views/PetCares/Details.cshtml	(revision 2aea0fddc0f6d0c25f0d44044eeb2ec5930012b9)
@@ -33,11 +33,4 @@
         </dd>
         <dt>
-            @Html.DisplayNameFor(model => model.start_date)
-        </dt>
-
-        <dd>
-            @Html.DisplayFor(model => model.start_date)
-        </dd>
-        <dt>
             @Html.DisplayNameFor(model => model.usersid)
         </dt>
Index: PostgreSqlDotnetCore/Views/PetCares/Edit.cshtml
===================================================================
--- PostgreSqlDotnetCore/Views/PetCares/Edit.cshtml	(revision a3ce071e97bad04f989c769589a31427febe9ff3)
+++ PostgreSqlDotnetCore/Views/PetCares/Edit.cshtml	(revision 2aea0fddc0f6d0c25f0d44044eeb2ec5930012b9)
@@ -32,11 +32,4 @@
         </div>
     </div>
-        <div class="form-group">
-            @Html.LabelFor(model => model.start_date, htmlAttributes: new { @class = "control-label col-md-2" })
-            <div class="col-md-10">
-                @Html.EditorFor(model => model.start_date, new { htmlAttributes = new { @class = "form-control" } })
-                @Html.ValidationMessageFor(model => model.start_date, "", new { @class = "text-danger" })
-            </div>
-        </div>
 
     <div class="form-group">
@@ -47,23 +40,6 @@
         </div>
     </div>
-    
 
-        <div class="form-group">
-            @Html.LabelFor(model => model.vetcentersid, htmlAttributes: new { @class = "control-label col-md-2" })
-            <div class="col-md-10">
-                @Html.DropDownListFor(model => model.vetcentersid, (SelectList)ViewBag.VetCenters, "Select VetCenter", new { @class = "form-control" })
-                @Html.ValidationMessageFor(model => model.vetcentersid, "", new { @class = "text-danger" })
-            </div>
-        </div>
-
-        <div class="form-group">
-            @Html.LabelFor(model => model.pet_id, htmlAttributes: new { @class = "control-label col-md-2" })
-            <div class="col-md-10">
-                @Html.DropDownListFor(model => model.pet_id, (SelectList)ViewBag.Pets, "Select Pet", new { @class = "form-control" })
-                @Html.ValidationMessageFor(model => model.pet_id, "", new { @class = "text-danger" })
-            </div>
-        </div>
-
-   @*<div class="form-group">
+    <div class="form-group">
         @Html.LabelFor(model => model.vetcentersid, htmlAttributes: new { @class = "control-label col-md-2" })
         <div class="col-md-10">
@@ -72,13 +48,4 @@
         </div>
     </div>
-    *@
-        @*
-        <div class="form-group">
-            <label class="control-label col-md-2" for="vetcentersid">VetCenter:</label>
-            <div class="col-md-10">
-                @Html.DropDownList("vetcentersid", (SelectList)ViewBag.VetCenters, "Select VetCenter", new { @class = "form-control" })
-            </div>
-        </div>
-    *@
 
 
Index: PostgreSqlDotnetCore/Views/PetCares/Index.cshtml
===================================================================
--- PostgreSqlDotnetCore/Views/PetCares/Index.cshtml	(revision a3ce071e97bad04f989c769589a31427febe9ff3)
+++ PostgreSqlDotnetCore/Views/PetCares/Index.cshtml	(revision 2aea0fddc0f6d0c25f0d44044eeb2ec5930012b9)
@@ -20,10 +20,6 @@
         </th>
         <th>
-            @Html.DisplayNameFor(model => model.start_date)
-        </th>
-        <th>
             @Html.DisplayNameFor(model => model.dateending)
         </th>
-       
         <th>
             @Html.DisplayNameFor(model => model.usersid)
@@ -32,7 +28,4 @@
             @Html.DisplayNameFor(model => model.vetcentersid)
         </th>
-        <th>
-            @Html.DisplayNameFor(model => model.PetsClass.name)
-        </th>
 
         <th></th>
@@ -40,39 +33,31 @@
     </tr>
 
-    @foreach (var item in Model)
-    {
-        <tr>
-            <td>
-                @Html.DisplayFor(modelItem => item.title)
-            </td>
-            <td>
-                @Html.DisplayFor(modelItem => item.description)
-            </td>
-            <td>
-                @Html.DisplayFor(modelItem => item.start_date)
-            </td>
-            <td>
-                @Html.DisplayFor(modelItem => item.dateending)
-            </td>
-            
-            <td>
-                @Html.DisplayFor(modelItem => item.usersid)
-            </td>
-            <td>
-                @Html.DisplayFor(modelItem => item.vetcentersid)
-            </td>
-            <td>
-                @Html.DisplayFor(modelItem => item.PetsClass.name)
-            </td>
+@foreach (var item in Model) {
+    <tr>
+        <td>
+            @Html.DisplayFor(modelItem => item.title)
+        </td>
+        <td>
+            @Html.DisplayFor(modelItem => item.description)
+        </td>
+        <td>
+            @Html.DisplayFor(modelItem => item.dateending)
+        </td>
+        <td>
+            @Html.DisplayFor(modelItem => item.usersid)
+        </td>
+        <td>
+            @Html.DisplayFor(modelItem => item.vetcentersid)
+        </td>
 
 
 
-            <td>
-                @Html.ActionLink("Edit", "Edit", new { id = item.id }) |
-                @Html.ActionLink("Details", "Details", new { id = item.id }) |
-                @Html.ActionLink("Delete", "Delete", new { id = item.id })
-            </td>
-        </tr>
-    }
+        <td>
+            @Html.ActionLink("Edit", "Edit", new { id = item.id }) |
+            @Html.ActionLink("Details", "Details", new { id = item.id }) |
+            @Html.ActionLink("Delete", "Delete", new { id = item.id })
+        </td>
+    </tr>
+}
 
 </table>
Index: PostgreSqlDotnetCore/Views/PetDiagnostics/Index.cshtml
===================================================================
--- PostgreSqlDotnetCore/Views/PetDiagnostics/Index.cshtml	(revision a3ce071e97bad04f989c769589a31427febe9ff3)
+++ 	(revision )
@@ -1,7 +1,0 @@
-﻿@model IEnumerable<PostgreSqlDotnetCore.Models.PetDetailsProcedure>
-
-@{
-    ViewBag.Title = "PetDetailsProcedure";
-}
-
-<h2>PetDetailsProcedure</h2>
Index: PostgreSqlDotnetCore/Views/PetDiagnostics/PetDiagnostics.cshtml
===================================================================
--- PostgreSqlDotnetCore/Views/PetDiagnostics/PetDiagnostics.cshtml	(revision a3ce071e97bad04f989c769589a31427febe9ff3)
+++ 	(revision )
@@ -1,71 +1,0 @@
-﻿@model IEnumerable<PostgreSqlDotnetCore.Models.PetDetailsProcedure>
-
-@{
-    ViewData["Title"] = "PetDiagnostics";
-}
-
-<h2>PetDiagnostics</h2>
-
-<p>
-    <a asp-action="Create">Create New</a>
-</p>
-<table class="table">
-    <thead>
-        <tr>
-            <th>
-                @Html.DisplayNameFor(model => model.pet_id)
-            </th>
-            <th>
-                @Html.DisplayNameFor(model => model.pet_name)
-            </th>
-            <th>
-                @Html.DisplayNameFor(model => model.diagnosis_description)
-            </th>
-            <th>
-                @Html.DisplayNameFor(model => model.medicine_name)
-            </th>
-            <th>
-                @Html.DisplayNameFor(model => model.medicine_description)
-            </th>
-            <th>
-                @Html.DisplayNameFor(model => model.therapy_description)
-            </th>
-            <th>
-                @Html.DisplayNameFor(model => model.therapy_date)
-            </th>
-            <th></th>
-        </tr>
-    </thead>
-    <tbody>
-@foreach (var item in Model) {
-        <tr>
-            <td>
-                @Html.DisplayFor(modelItem => item.pet_id)
-            </td>
-            <td>
-                @Html.DisplayFor(modelItem => item.pet_name)
-            </td>
-            <td>
-                @Html.DisplayFor(modelItem => item.diagnosis_description)
-            </td>
-            <td>
-                @Html.DisplayFor(modelItem => item.medicine_name)
-            </td>
-            <td>
-                @Html.DisplayFor(modelItem => item.medicine_description)
-            </td>
-            <td>
-                @Html.DisplayFor(modelItem => item.therapy_description)
-            </td>
-            <td>
-                @Html.DisplayFor(modelItem => item.therapy_date)
-            </td>
-            <td>
-                @Html.ActionLink("Edit", "Edit", new { /* id=item.PrimaryKey */ }) |
-                @Html.ActionLink("Details", "Details", new { /* id=item.PrimaryKey */ }) |
-                @Html.ActionLink("Delete", "Delete", new { /* id=item.PrimaryKey */ })
-            </td>
-        </tr>
-}
-    </tbody>
-</table>
Index: PostgreSqlDotnetCore/Views/Pets/Create.cshtml
===================================================================
--- PostgreSqlDotnetCore/Views/Pets/Create.cshtml	(revision a3ce071e97bad04f989c769589a31427febe9ff3)
+++ PostgreSqlDotnetCore/Views/Pets/Create.cshtml	(revision 2aea0fddc0f6d0c25f0d44044eeb2ec5930012b9)
@@ -16,12 +16,4 @@
     <hr />
     @Html.ValidationSummary(true, "", new { @class = "text-danger" })
-
-        <div class="form-group">
-            @Html.LabelFor(model => model.name, htmlAttributes: new { @class = "control-label col-md-2" })
-            <div class="col-md-10">
-                @Html.EditorFor(model => model.name, new { htmlAttributes = new { @class = "form-control" } })
-                @Html.ValidationMessageFor(model => model.name, "", new { @class = "text-danger" })
-            </div>
-        </div>
 
     <div class="form-group">
Index: PostgreSqlDotnetCore/Views/Pets/Delete.cshtml
===================================================================
--- PostgreSqlDotnetCore/Views/Pets/Delete.cshtml	(revision a3ce071e97bad04f989c769589a31427febe9ff3)
+++ PostgreSqlDotnetCore/Views/Pets/Delete.cshtml	(revision 2aea0fddc0f6d0c25f0d44044eeb2ec5930012b9)
@@ -12,12 +12,4 @@
     <hr />
     <dl class="dl-horizontal">
-
-        <dt>
-            @Html.DisplayNameFor(model => model.name)
-        </dt>
-
-        <dd>
-            @Html.DisplayFor(model => model.name)
-        </dd>
         <dt>
             @Html.DisplayNameFor(model => model.color)
Index: PostgreSqlDotnetCore/Views/Pets/Details.cshtml
===================================================================
--- PostgreSqlDotnetCore/Views/Pets/Details.cshtml	(revision a3ce071e97bad04f989c769589a31427febe9ff3)
+++ PostgreSqlDotnetCore/Views/Pets/Details.cshtml	(revision 2aea0fddc0f6d0c25f0d44044eeb2ec5930012b9)
@@ -11,11 +11,4 @@
     <hr />
     <dl class="dl-horizontal">
-        <dt>
-            @Html.DisplayNameFor(model => model.name)
-        </dt>
-
-        <dd>
-            @Html.DisplayFor(model => model.name)
-        </dd>
         <dt>
             @Html.DisplayNameFor(model => model.color)
Index: PostgreSqlDotnetCore/Views/Pets/Edit.cshtml
===================================================================
--- PostgreSqlDotnetCore/Views/Pets/Edit.cshtml	(revision a3ce071e97bad04f989c769589a31427febe9ff3)
+++ PostgreSqlDotnetCore/Views/Pets/Edit.cshtml	(revision 2aea0fddc0f6d0c25f0d44044eeb2ec5930012b9)
@@ -18,11 +18,4 @@
     @Html.HiddenFor(model => model.id)
 
-        <div class="form-group">
-            @Html.LabelFor(model => model.name, htmlAttributes: new { @class = "control-label col-md-2" })
-            <div class="col-md-10">
-                @Html.EditorFor(model => model.name, new { htmlAttributes = new { @class = "form-control" } })
-                @Html.ValidationMessageFor(model => model.name, "", new { @class = "text-danger" })
-            </div>
-        </div>
     <div class="form-group">
         @Html.LabelFor(model => model.color, htmlAttributes: new { @class = "control-label col-md-2" })
Index: PostgreSqlDotnetCore/Views/Pets/Index.cshtml
===================================================================
--- PostgreSqlDotnetCore/Views/Pets/Index.cshtml	(revision a3ce071e97bad04f989c769589a31427febe9ff3)
+++ PostgreSqlDotnetCore/Views/Pets/Index.cshtml	(revision 2aea0fddc0f6d0c25f0d44044eeb2ec5930012b9)
@@ -12,7 +12,4 @@
 <table class="table">
     <tr>
-        <th>
-            @Html.DisplayNameFor(model => model.name)
-        </th>
 
         <th>
@@ -39,7 +36,4 @@
 @foreach (var item in Model) {
     <tr>
-            <td>
-                @Html.DisplayFor(modelItem => item.name)
-            </td>
         <td>
             @Html.DisplayFor(modelItem => item.color)
Index: PostgreSqlDotnetCore/Views/Products/Create.cshtml
===================================================================
--- PostgreSqlDotnetCore/Views/Products/Create.cshtml	(revision a3ce071e97bad04f989c769589a31427febe9ff3)
+++ PostgreSqlDotnetCore/Views/Products/Create.cshtml	(revision 2aea0fddc0f6d0c25f0d44044eeb2ec5930012b9)
@@ -48,14 +48,4 @@
         </div>
     </div>
-
-        <div class="form-group">
-            @Html.LabelFor(model => model.available_quantity, htmlAttributes: new { @class = "control-label col-md-2" })
-            <div class="col-md-10">
-                @Html.EditorFor(model => model.available_quantity, new { htmlAttributes = new { @class = "form-control" } })
-                <span class="input-group-addon">euro</span>
-                @Html.ValidationMessageFor(model => model.available_quantity, "", new { @class = "text-danger" })
-            </div>
-        </div>
-    
     @*<div class="form-group">
             @Html.LabelFor(model => model.category, htmlAttributes: new { @class = "control-label col-md-2" })
@@ -67,5 +57,5 @@
 
     <div class="form-group">
-        <label for="category">Category:</label>
+        <label for="category">Jobs:</label>
         <select class="form-control" id="category" name="category">
             <option value="">Select category</option>
Index: PostgreSqlDotnetCore/Views/Products/Delete.cshtml
===================================================================
--- PostgreSqlDotnetCore/Views/Products/Delete.cshtml	(revision a3ce071e97bad04f989c769589a31427febe9ff3)
+++ PostgreSqlDotnetCore/Views/Products/Delete.cshtml	(revision 2aea0fddc0f6d0c25f0d44044eeb2ec5930012b9)
@@ -56,12 +56,4 @@
         </dd>
 
-        <dt>
-            @Html.DisplayNameFor(model => model.available_quantity)
-        </dt>
-
-        <dd>
-            @Html.DisplayFor(model => model.available_quantity)
-        </dd>
-
 
     </dl>
Index: PostgreSqlDotnetCore/Views/Products/Details.cshtml
===================================================================
--- PostgreSqlDotnetCore/Views/Products/Details.cshtml	(revision a3ce071e97bad04f989c769589a31427febe9ff3)
+++ PostgreSqlDotnetCore/Views/Products/Details.cshtml	(revision 2aea0fddc0f6d0c25f0d44044eeb2ec5930012b9)
@@ -55,12 +55,4 @@
         </dd>
 
-        <dt>
-            @Html.DisplayNameFor(model => model.available_quantity)
-        </dt>
-
-        <dd>
-            @Html.DisplayFor(model => model.available_quantity)
-        </dd>
-
     </dl>
 </div>
Index: PostgreSqlDotnetCore/Views/Products/Edit.cshtml
===================================================================
--- PostgreSqlDotnetCore/Views/Products/Edit.cshtml	(revision a3ce071e97bad04f989c769589a31427febe9ff3)
+++ PostgreSqlDotnetCore/Views/Products/Edit.cshtml	(revision 2aea0fddc0f6d0c25f0d44044eeb2ec5930012b9)
@@ -54,11 +54,4 @@
         </div>
     </div>
-        <div class="form-group">
-            @Html.LabelFor(model => model.available_quantity, htmlAttributes: new { @class = "control-label col-md-2" })
-            <div class="col-md-10">
-                @Html.EditorFor(model => model.available_quantity, new { htmlAttributes = new { @class = "form-control" } })
-                @Html.ValidationMessageFor(model => model.available_quantity, "", new { @class = "text-danger" })
-            </div>
-        </div>
 
     <div class="form-group">
Index: PostgreSqlDotnetCore/Views/Products/Index.cshtml
===================================================================
--- PostgreSqlDotnetCore/Views/Products/Index.cshtml	(revision a3ce071e97bad04f989c769589a31427febe9ff3)
+++ PostgreSqlDotnetCore/Views/Products/Index.cshtml	(revision 2aea0fddc0f6d0c25f0d44044eeb2ec5930012b9)
@@ -60,5 +60,5 @@
 </style>
 <h2>All type of products</h2>
-@if (SignInManager.IsSignedIn(User) && ViewBag.hasAccess != null)
+@if (SignInManager.IsSignedIn(User))
 {
     <p>
@@ -98,9 +98,5 @@
                         <div class="col-md-6 col-xs-6">
                             <h3>@item.name</h3>
-                            @if (SignInManager.IsSignedIn(User) && ViewBag.hasAccess != null)
-                            // SignInManager.IsSignedIn(User) && ViewBag.hasAccess != null
-                            //SignInManager.IsSignedIn(User) && ViewBag.hasAccess != null && ViewBag.hasAccess == true
-                         
-                                
+                            @if (SignInManager.IsSignedIn(User))
                             {
                                 <div class="edit-crud-products">
@@ -108,10 +104,7 @@
                                     @Html.ActionLink("Details", "Details", new { id = item.id }) |
                                     @Html.ActionLink("Delete", "Delete", new { id = item.id })
-                                    @Html.ActionLink("Procedure", "Procedure", new { id = item.id })
                                 </div>
                             }
                         </div>
-                        
-                       
                         <div class="col-md-6 col-xs-6 price">
                             <h3>
Index: PostgreSqlDotnetCore/Views/Shared/_Layout.cshtml
===================================================================
--- PostgreSqlDotnetCore/Views/Shared/_Layout.cshtml	(revision a3ce071e97bad04f989c769589a31427febe9ff3)
+++ PostgreSqlDotnetCore/Views/Shared/_Layout.cshtml	(revision 2aea0fddc0f6d0c25f0d44044eeb2ec5930012b9)
@@ -13,5 +13,4 @@
 </head>
 <body>
-    @* <h1>@(ViewBag.isAuthenticated == null ? "krij" : "prikazi")</h1> *@
     <header>
         <nav class="navbar navbar-expand-sm navbar-toggleable-sm navbar-light bg-white border-bottom box-shadow mb-3">
@@ -27,50 +26,22 @@
                             <a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Index">Home</a>
                         </li>
-                        @{
-                            if (ViewBag.isAuthenticated != null)
-                            {
-                                <li class="nav-item">
-                                    <a class="nav-link text-dark" asp-area="" asp-controller="Pets" asp-action="Index">Pets</a>
-                                </li>
-                            }
-                        }
+                        <li class="nav-item">
+                            <a class="nav-link text-dark" asp-area="" asp-controller="Pets" asp-action="Index">Pets</a>
+                        </li>
                         <li class="nav-item">
                             <a class="nav-link text-dark" asp-area="" asp-controller="Products" asp-action="Index">Products</a>
                         </li>
-                        @{
-                            if (ViewBag.isAuthenticated != null)
-                            {
-                                <li class="nav-item">
-                                    <a class="nav-link text-dark" asp-area="" asp-controller="PetCares" asp-action="Index">Pet Cares</a>
-                                </li>
-                                <li class="nav-item">
-                                    <a class="nav-link text-dark" asp-area="" asp-controller="Customer" asp-action="Index">Manage Customers</a>
-                                </li>
-                               @* <li class="nav-item">
-                                    <a class="nav-link text-dark" asp-area="" asp-controller="City" asp-action="Index">Manage Cities</a>
-                                </li>
-                               *@
-                                <li class="nav-item">
-                                    <a class="nav-link text-dark" asp-area="" asp-controller="Blog" asp-action="Index">BlogPost</a>
-                                </li>
-                            }
-
-                          
-
-                            
-                        }
-                        @if (ViewBag.OnlyAdminManager != null)
-                        {
-                            <li class="nav-item">
-                                <a class="nav-link text-dark" asp-area="" asp-controller="City" asp-action="Index">Manage Cities</a>
-                            </li>
-                        }
-
-
-                       
-                        
-
-
-                       
+                        <li class="nav-item">
+                            <a class="nav-link text-dark" asp-area="" asp-controller="PetCares" asp-action="Index">Pet Cares</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link text-dark" asp-area="" asp-controller="Customer" asp-action="Index">Manage Customers</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link text-dark" asp-area="" asp-controller="City" asp-action="Index">Manage Cities</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link text-dark" asp-area="" asp-controller="Blog" asp-action="Index">BlogPost</a>
+                        </li>
                         <li class="nav-item">
                             <a class="nav-link text-dark" asp-area="" asp-controller="VetCenter" asp-action="Index">VetCenters</a>
Index: PostgreSqlDotnetCore/Views/VetCenter/Create.cshtml
===================================================================
--- PostgreSqlDotnetCore/Views/VetCenter/Create.cshtml	(revision a3ce071e97bad04f989c769589a31427febe9ff3)
+++ PostgreSqlDotnetCore/Views/VetCenter/Create.cshtml	(revision 2aea0fddc0f6d0c25f0d44044eeb2ec5930012b9)
@@ -8,127 +8,121 @@
 
 
-@using (Html.BeginForm())
+@using (Html.BeginForm()) 
 {
     @Html.AntiForgeryToken()
-
-    <div class="form-horizontal">
-        <h4>VetCenter</h4>
-        <hr />
-        @Html.ValidationSummary(true, "", new { @class = "text-danger" })
-        <div class="form-group">
-            @Html.LabelFor(model => model.name, htmlAttributes: new { @class = "control-label col-md-2" })
-            <div class="col-md-10">
-                @Html.EditorFor(model => model.name, new { htmlAttributes = new { @class = "form-control" } })
-                @Html.ValidationMessageFor(model => model.name, "", new { @class = "text-danger" })
-            </div>
-        </div>
-
-        <div class="form-group">
-            @Html.LabelFor(model => model.adress, htmlAttributes: new { @class = "control-label col-md-2" })
-            <div class="col-md-10">
-                @Html.EditorFor(model => model.adress, new { htmlAttributes = new { @class = "form-control" } })
-                @Html.ValidationMessageFor(model => model.adress, "", new { @class = "text-danger" })
-            </div>
-        </div>
-        <div class="form-group">
-            @Html.LabelFor(model => model.description, htmlAttributes: new { @class = "control-label col-md-2" })
-            <div class="col-md-10">
-                @Html.EditorFor(model => model.description, new { htmlAttributes = new { @class = "form-control" } })
-                @Html.ValidationMessageFor(model => model.description, "", new { @class = "text-danger" })
-            </div>
-        </div>
-        <div class="form-group">
-            @Html.LabelFor(model => model.workinghours, htmlAttributes: new { @class = "control-label col-md-2" })
-            <div class="col-md-10">
-                @Html.EditorFor(model => model.workinghours, new { htmlAttributes = new { @class = "form-control" } })
-                @Html.ValidationMessageFor(model => model.workinghours, "", new { @class = "text-danger" })
-            </div>
-        </div>
-
-        <div class="form-group">
-            @Html.LabelFor(model => model.phonenumber, htmlAttributes: new { @class = "control-label col-md-2" })
-            <div class="col-md-10">
-                @Html.EditorFor(model => model.phonenumber, new { htmlAttributes = new { @class = "form-control" } })
-                @Html.ValidationMessageFor(model => model.phonenumber, "", new { @class = "text-danger" })
-            </div>
-        </div>
-        <div class="form-group">
-            @Html.LabelFor(model => model.latitude, htmlAttributes: new { @class = "control-label col-md-2" })
-            <div class="col-md-10">
-                @Html.EditorFor(model => model.latitude, new { htmlAttributes = new { @class = "form-control" } })
-                @Html.ValidationMessageFor(model => model.latitude, "", new { @class = "text-danger" })
-            </div>
-        </div>
-        <div class="form-group">
-            @Html.LabelFor(model => model.longitude, htmlAttributes: new { @class = "control-label col-md-2" })
-            <div class="col-md-10">
-                @Html.EditorFor(model => model.longitude, new { htmlAttributes = new { @class = "form-control" } })
-                @Html.ValidationMessageFor(model => model.longitude, "", new { @class = "text-danger" })
-            </div>
-        </div>
-        @*<div class="form-group">
-    @Html.LabelFor(model => model.citiesid, htmlAttributes: new { @class = "control-label col-md-2" })
-    <div class="col-md-10">
-    @Html.EditorFor(model => model.citiesid, new { htmlAttributes = new { @class = "form-control" } })
-    @Html.ValidationMessageFor(model => model.citiesid, "", new { @class = "text-danger" })
-    </div>
-    </div>*@
-
-        @*  <div class="form-group">
-    <label for="citiesid">Citie:</label>
-    <select class="form-control" id="citiesid" name="citiesid">
-    <option value="">Select city</option>
-    <option value="1">Скопје</option>
-    <option value="1">Охрид</option>
-    <option value="1">Скопје</option>
-    <option value="1">Берово</option>
-    <option value="2">Битола</option>
-    <option value="3">Богданци</option>
-    <option value="4">Валандово</option>
-    <option value="5">Велес</option>
-    <option value="6">Виница</option>
-    <option value="7">Гевгелија</option>
-    <option value="8">Гостивар</option>
-    <option value="9">Дебар</option>
-    <option value="10">Делчево</option>
-    <option value="11">Демир Капија</option>
-    <option value="12">Демир Хисар</option>
-    <option value="13">Кавадарци</option>
-    <option value="14">Кичево</option>
-    <option value="15">Кочани</option>
-    <option value="16">Кратово</option>
-    <option value="17">Крива Паланка</option>
-    <option value="18">Крушево</option>
-    <option value="19">Куманово</option>
-    <option value="20">Македонска Каменица</option>
-    <option value="21">Македонски Брод</option>
-    <option value="22">Неготино</option>
-    <option value="23">Охрид</option>
-    <option value="24">Пехчево</option>
-    <option value="25">Прилеп</option>
-    <option value="26">Пропиштип</option>
-    <option value="27">Радовиш</option>
-    <option value="28">Ресен</option>
-    <option value="29">Свети Николе</option>
-    <option value="30">Скопје</option>
-    <option value="31">Струга</option>
-    <option value="32">Струмица</option>
-    <option value="33">Тетово</option>
-    <option value="34">Штип</option>
-    </select>
-    </div>
-    *@
-
-        <div class="form-group">
-            <label asp-for="citiesid" class="control-label"></label>
-            <select asp-for="citiesid" asp-items="ViewBag.Citiess" class="form-control"></select>
-            <span asp-validation-for="citiesid" class="text-danger"></span>
-        </div>
-        <div class="form-group">
-            <div class="col-md-offset-2 col-md-10">
-                <input type="submit" value="Create" class="btn btn-default" />
-            </div>
+    
+<div class="form-horizontal">
+    <h4>VetCenter</h4>
+    <hr />
+    @Html.ValidationSummary(true, "", new { @class = "text-danger" })
+    <div class="form-group">
+        @Html.LabelFor(model => model.name, htmlAttributes: new { @class = "control-label col-md-2" })
+        <div class="col-md-10">
+            @Html.EditorFor(model => model.name, new { htmlAttributes = new { @class = "form-control" } })
+            @Html.ValidationMessageFor(model => model.name, "", new { @class = "text-danger" })
         </div>
     </div>
+
+    <div class="form-group">
+        @Html.LabelFor(model => model.adress, htmlAttributes: new { @class = "control-label col-md-2" })
+        <div class="col-md-10">
+            @Html.EditorFor(model => model.adress, new { htmlAttributes = new { @class = "form-control" } })
+            @Html.ValidationMessageFor(model => model.adress, "", new { @class = "text-danger" })
+        </div>
+    </div>
+    <div class="form-group">
+        @Html.LabelFor(model => model.description, htmlAttributes: new { @class = "control-label col-md-2" })
+        <div class="col-md-10">
+            @Html.EditorFor(model => model.description, new { htmlAttributes = new { @class = "form-control" } })
+            @Html.ValidationMessageFor(model => model.description, "", new { @class = "text-danger" })
+        </div>
+    </div>
+    <div class="form-group">
+        @Html.LabelFor(model => model.workinghours, htmlAttributes: new { @class = "control-label col-md-2" })
+        <div class="col-md-10">
+            @Html.EditorFor(model => model.workinghours, new { htmlAttributes = new { @class = "form-control" } })
+            @Html.ValidationMessageFor(model => model.workinghours, "", new { @class = "text-danger" })
+        </div>
+    </div>
+
+    <div class="form-group">
+        @Html.LabelFor(model => model.phonenumber, htmlAttributes: new { @class = "control-label col-md-2" })
+        <div class="col-md-10">
+            @Html.EditorFor(model => model.phonenumber, new { htmlAttributes = new { @class = "form-control" } })
+            @Html.ValidationMessageFor(model => model.phonenumber, "", new { @class = "text-danger" })
+        </div>
+    </div>
+    <div class="form-group">
+        @Html.LabelFor(model => model.latitude, htmlAttributes: new { @class = "control-label col-md-2" })
+        <div class="col-md-10">
+            @Html.EditorFor(model => model.latitude, new { htmlAttributes = new { @class = "form-control" } })
+            @Html.ValidationMessageFor(model => model.latitude, "", new { @class = "text-danger" })
+        </div>
+    </div>
+    <div class="form-group">
+        @Html.LabelFor(model => model.longitude, htmlAttributes: new { @class = "control-label col-md-2" })
+        <div class="col-md-10">
+            @Html.EditorFor(model => model.longitude, new { htmlAttributes = new { @class = "form-control" } })
+            @Html.ValidationMessageFor(model => model.longitude, "", new { @class = "text-danger" })
+        </div>
+    </div>
+    @*<div class="form-group">
+            @Html.LabelFor(model => model.citiesid, htmlAttributes: new { @class = "control-label col-md-2" })
+            <div class="col-md-10">
+                @Html.EditorFor(model => model.citiesid, new { htmlAttributes = new { @class = "form-control" } })
+                @Html.ValidationMessageFor(model => model.citiesid, "", new { @class = "text-danger" })
+            </div>
+        </div>*@
+
+    <div class="form-group">
+        <label for="citiesid">Citie:</label>
+        <select class="form-control" id="citiesid" name="citiesid">
+            <option value="">Select city</option>
+            <option value="1">Скопје</option>
+            <option value="1">Охрид</option>
+            <option value="1">Скопје</option>
+           @*  <option value="1">Берово</option>
+            <option value="2">Битола</option>
+            <option value="3">Богданци</option>
+            <option value="4">Валандово</option>
+            <option value="5">Велес</option>
+            <option value="6">Виница</option>
+            <option value="7">Гевгелија</option>
+            <option value="8">Гостивар</option>
+            <option value="9">Дебар</option>
+            <option value="10">Делчево</option>
+            <option value="11">Демир Капија</option>
+            <option value="12">Демир Хисар</option>
+            <option value="13">Кавадарци</option>
+            <option value="14">Кичево</option>
+            <option value="15">Кочани</option>
+            <option value="16">Кратово</option>
+            <option value="17">Крива Паланка</option>
+            <option value="18">Крушево</option>
+            <option value="19">Куманово</option>
+            <option value="20">Македонска Каменица</option>
+            <option value="21">Македонски Брод</option>
+            <option value="22">Неготино</option>
+            <option value="23">Охрид</option>
+            <option value="24">Пехчево</option>
+            <option value="25">Прилеп</option>
+            <option value="26">Пропиштип</option>
+            <option value="27">Радовиш</option>
+            <option value="28">Ресен</option>
+            <option value="29">Свети Николе</option>
+            <option value="30">Скопје</option>
+            <option value="31">Струга</option>
+            <option value="32">Струмица</option>
+            <option value="33">Тетово</option>
+            <option value="34">Штип</option> *@
+        </select>
+    </div>
+
+    <div class="form-group">
+        <div class="col-md-offset-2 col-md-10">
+            <input type="submit" value="Create" class="btn btn-default" />
+        </div>
+    </div>
+</div>
 }
 
Index: PostgreSqlDotnetCore/Views/VetCenter/Details.cshtml
===================================================================
--- PostgreSqlDotnetCore/Views/VetCenter/Details.cshtml	(revision a3ce071e97bad04f989c769589a31427febe9ff3)
+++ PostgreSqlDotnetCore/Views/VetCenter/Details.cshtml	(revision 2aea0fddc0f6d0c25f0d44044eeb2ec5930012b9)
@@ -1,3 +1,3 @@
-﻿@model PostgreSqlDotnetCore.Models.VetCenterWithCity
+﻿@model PostgreSqlDotnetCore.Models.VetCenter
 
 @{
@@ -5,50 +5,73 @@
 }
 
-<h2>Details for @Model.vet_center_name</h2>
+<h2>Details</h2>
 
-<table class="table">
-    <tr>
-        <th>@Html.DisplayNameFor(model => model.vet_center_name)</th>
-        <td>@Html.DisplayFor(model => model.vet_center_name)</td>
-    </tr>
-    <tr>
-        <th>@Html.DisplayNameFor(model => model.adress)</th>
-        <td>@Html.DisplayFor(model => model.adress)</td>
-    </tr>
-    <tr>
-        <th>@Html.DisplayNameFor(model => model.workinghours)</th>
-        <td>@Html.DisplayFor(model => model.workinghours)</td>
-    </tr>
-    <tr>
-        <th>@Html.DisplayNameFor(model => model.description)</th>
-        <td>@Html.DisplayFor(model => model.description)</td>
-    </tr>
-    <tr>
-        <th>@Html.DisplayNameFor(model => model.phonenumber)</th>
-        <td>@Html.DisplayFor(model => model.phonenumber)</td>
-    </tr>
-    <tr>
-        <th>@Html.DisplayNameFor(model => model.latitude)</th>
-        <td>@Html.DisplayFor(model => model.latitude)</td>
-    </tr>
-    <tr>
-        <th>@Html.DisplayNameFor(model => model.longitude)</th>
-        <td>@Html.DisplayFor(model => model.longitude)</td>
-    </tr>
-    <tr>
-        <th>@Html.DisplayNameFor(model => model.city_name)</th>
-        <td>@Html.DisplayFor(model => model.city_name)</td>
-    </tr>
-</table>
+<div>
+    <h4>VetCenter</h4>
+    <hr />
+    <dl class="dl-horizontal">
+        <dt>
+            @Html.DisplayNameFor(model => model.name)
+        </dt>
 
-@if (ViewBag.hasAccess != null && ViewBag.hasAccess == true)
-{
-    <p>
-        @Html.ActionLink("Edit", "Edit", new { id = Model.id }) |
-        @Html.ActionLink("Delete", "Delete", new { id = Model.id })
-    </p>
-}
+        <dd>
+            @Html.DisplayFor(model => model.name)
+        </dd>
 
+        <dt>
+            @Html.DisplayNameFor(model => model.adress)
+        </dt>
+
+        <dd>
+            @Html.DisplayFor(model => model.adress)
+        </dd>
+        <dt>
+            @Html.DisplayNameFor(model => model.description)
+        </dt>
+
+        <dd>
+            @Html.DisplayFor(model => model.description)
+        </dd>
+        <dt>
+            @Html.DisplayNameFor(model => model.workinghours)
+        </dt>
+
+        <dd>
+            @Html.DisplayFor(model => model.workinghours)
+        </dd>
+        <dt>
+            @Html.DisplayNameFor(model => model.phonenumber)
+        </dt>
+
+        <dd>
+            @Html.DisplayFor(model => model.phonenumber)
+        </dd>
+        <dt>
+            @Html.DisplayNameFor(model => model.latitude)
+        </dt>
+
+        <dd>
+            @Html.DisplayFor(model => model.latitude)
+        </dd>
+        <dt>
+            @Html.DisplayNameFor(model => model.longitude)
+        </dt>
+
+        <dd>
+            @Html.DisplayFor(model => model.longitude)
+        </dd>
+        <dt>
+            @Html.DisplayNameFor(model => model.citiesid)
+        </dt>
+
+        <dd>
+            @Html.DisplayFor(model => model.citiesid)
+        </dd>
+
+
+    </dl>
+</div>
 <p>
+    @Html.ActionLink("Edit", "Edit", new { id = Model.id }) |
     @Html.ActionLink("Back to List", "Index")
 </p>
Index: PostgreSqlDotnetCore/Views/VetCenter/Edit.cshtml
===================================================================
--- PostgreSqlDotnetCore/Views/VetCenter/Edit.cshtml	(revision a3ce071e97bad04f989c769589a31427febe9ff3)
+++ PostgreSqlDotnetCore/Views/VetCenter/Edit.cshtml	(revision 2aea0fddc0f6d0c25f0d44044eeb2ec5930012b9)
@@ -75,5 +75,5 @@
         </div>
     </div> *@
-      @*  <div class="form-group">
+        <div class="form-group">
             <label for="citiesid">Citie:</label>
             <select class="form-control" id="citiesid" name="citiesid">
@@ -84,10 +84,5 @@
             </select>
         </div>
-        *@
-        <div class="form-group">
-            <label asp-for="citiesid" class="control-label"></label>
-            <select asp-for="citiesid" asp-items="ViewBag.Citiess" class="form-control"></select>
-            <span asp-validation-for="citiesid" class="text-danger"></span>
-        </div>
+
 
     <div class="form-group">
Index: PostgreSqlDotnetCore/Views/VetCenter/Index.cshtml
===================================================================
--- PostgreSqlDotnetCore/Views/VetCenter/Index.cshtml	(revision a3ce071e97bad04f989c769589a31427febe9ff3)
+++ PostgreSqlDotnetCore/Views/VetCenter/Index.cshtml	(revision 2aea0fddc0f6d0c25f0d44044eeb2ec5930012b9)
@@ -1,7 +1,5 @@
 ﻿@using Microsoft.AspNetCore.Identity
 @inject SignInManager<IdentityUser> SignInManager
-@* IEnumerable<PostgreSqlDotnetCore.Models.VetCenter>*@
-@model IEnumerable<PostgreSqlDotnetCore.Models.VetCenterWithCity>
-
+@model IEnumerable<PostgreSqlDotnetCore.Models.VetCenter>
 
 @{
@@ -11,19 +9,11 @@
 <h2>Vet Center</h2>
 
-@*<p>
+<p>
     @Html.ActionLink("Create New", "Create")
 </p>
-*@
-@if (ViewBag.hasAccess != null && ViewBag.hasAccess == true)
-{
-    <p>
-        @Html.ActionLink("Create New", "Create")
-    </p>
-}
-
 <table class="table">
     <tr>
         <th>
-            @Html.DisplayNameFor(model => model.vet_center_name)
+            @Html.DisplayNameFor(model => model.name)
         </th>
         <th>
@@ -34,9 +24,7 @@
             @Html.DisplayNameFor(model => model.workinghours)
         </th>
-        @*
         <th>
             @Html.DisplayNameFor(model => model.description)
         </th>
-        *@
         <th>
             @Html.DisplayNameFor(model => model.phonenumber)
@@ -49,5 +37,5 @@
         </th>
         <th>
-            @Html.DisplayNameFor(model => model.city_name)
+            @Html.DisplayNameFor(model => model.citiesid)
         </th>
         <th></th>
@@ -58,5 +46,5 @@
         <tr>
             <td>
-                @Html.DisplayFor(modelItem => item.vet_center_name)
+                @Html.DisplayFor(modelItem => item.name)
             </td>
             <td>
@@ -66,8 +54,8 @@
                 @Html.DisplayFor(modelItem => item.workinghours)
             </td>
-           @* <td>
+            <td>
                 @Html.DisplayFor(modelItem => item.description)
             </td>
-            *@
+
             <td>
                 @Html.DisplayFor(modelItem => item.phonenumber)
@@ -80,5 +68,5 @@
             </td>
             <td>
-                @Html.DisplayFor(modelItem => item.city_name)
+                @Html.DisplayFor(modelItem => item.citiesid)
             </td>
             <td>
@@ -89,25 +77,12 @@
             </td>
 
-
-
-            @*   @if ((SignInManager.IsSignedIn(User)))
-        {
-        <td>
-
-        @Html.ActionLink("Edit", "Edit", new { id = item.id }) |
-        @Html.ActionLink("Details", "Details", new { id = item.id }) |
-        @Html.ActionLink("Delete", "Delete", new { id = item.id })
-
-        </td>
-        }
-        *@
-
-            @* Додадете условие за проверка на улогите *@
-            @if (SignInManager.IsSignedIn(User) && (ViewBag.hasAccess != null && ViewBag.hasAccess == true))
+            @if (SignInManager.IsSignedIn(User))
             {
                 <td>
+
                     @Html.ActionLink("Edit", "Edit", new { id = item.id }) |
                     @Html.ActionLink("Details", "Details", new { id = item.id }) |
                     @Html.ActionLink("Delete", "Delete", new { id = item.id })
+
                 </td>
             }
Index: PostgreSqlDotnetCore/appsettings.json
===================================================================
--- PostgreSqlDotnetCore/appsettings.json	(revision a3ce071e97bad04f989c769589a31427febe9ff3)
+++ PostgreSqlDotnetCore/appsettings.json	(revision 2aea0fddc0f6d0c25f0d44044eeb2ec5930012b9)
@@ -1,6 +1,5 @@
 {
   "ConnectionStrings": {
-    "DefaultConnection": "User ID=db_202324z_va_prj_vetcareconnect_owner;Password=79424061a9b1;Server=localhost;Port=9999;Database=db_202324z_va_prj_vetcareconnect;Integrated Security=true;Pooling=true;",
-    "DefaultConnection_local": "User ID=elena;Password=elena;Server=localhost;Port=5432;Database=postgres;Integrated Security=true;Pooling=true;"
+    "DefaultConnection": "User ID=db_202324z_va_prj_vetcareconnect_owner;Password=79424061a9b1;Server=localhost;Port=9999;Database=db_202324z_va_prj_vetcareconnect;Integrated Security=true;Pooling=true;"
   },
   "Logging": {
