From 3055949aac32ccbeae3a7df72a1253d96e08ae27 Mon Sep 17 00:00:00 2001 From: Babak Alizadeh Date: Thu, 9 Nov 2023 10:28:50 -0800 Subject: [PATCH] some progress --- .../src/Controller/AdminController.php | 41 +++++++++++- .../src/Controller/Front/AppController.php | 62 ------------------- hesabixCore/templates/app/base.html.twig | 6 -- .../templates/app/changes/list.html.twig | 52 ---------------- .../templates/app/changes/new.html.twig | 27 -------- 5 files changed, 40 insertions(+), 148 deletions(-) delete mode 100644 hesabixCore/templates/app/changes/list.html.twig delete mode 100644 hesabixCore/templates/app/changes/new.html.twig diff --git a/hesabixCore/src/Controller/AdminController.php b/hesabixCore/src/Controller/AdminController.php index 27a57ce..f561585 100644 --- a/hesabixCore/src/Controller/AdminController.php +++ b/hesabixCore/src/Controller/AdminController.php @@ -13,6 +13,7 @@ use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\Console\Input\ArrayInput; use Symfony\Component\Console\Output\BufferedOutput; use Symfony\Component\HttpFoundation\JsonResponse; +use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpKernel\KernelInterface; use Symfony\Component\Routing\Annotation\Route; @@ -77,7 +78,7 @@ class AdminController extends AbstractController #[Route('/api/admin/reportchange/lists', name: 'app_admin_reportchange_list')] public function app_admin_reportchange_list(Jdate $jdate,Provider $provider,EntityManagerInterface $entityManager): JsonResponse { - $rows = $entityManager->getRepository(ChangeReport::class)->findAll(); + $rows = $entityManager->getRepository(ChangeReport::class)->findBy([],['id'=>'DESC']); foreach ($rows as $row){ $row->setDateSubmit($jdate->jdate('Y/n/d',$row->getDateSubmit())); } @@ -94,4 +95,42 @@ class AdminController extends AbstractController } return $this->json(['result'=>1]); } + + #[Route('/api/admin/reportchange/get/{id}', name: 'app_admin_reportchange_get')] + public function app_admin_reportchange_get(string $id,EntityManagerInterface $entityManager): JsonResponse + { + $item = $entityManager->getRepository(ChangeReport::class)->find($id); + if(!$item) + throw $this->createNotFoundException(); + return $this->json($item); + } + + #[Route('/api/admin/reportchange/mod/{id}', name: 'app_admin_reportchange_mod')] + public function app_admin_reportchange_mod(Request $request,EntityManagerInterface $entityManager, int $id = 0): JsonResponse + { + $item = new ChangeReport(); + $item->setDateSubmit(time()); + + if($id != 0){ + $item = $entityManager->getRepository(ChangeReport::class)->find($id); + if(!$item) + throw $this->createNotFoundException(); + else + $item->setDateSubmit(time()); + + } + $params = []; + if ($content = $request->getContent()) { + $params = json_decode($content, true); + } + if(array_key_exists('version',$params) && array_key_exists('body',$params)){ + $item->setBody($params['body']); + $item->setVersion($params['version']); + } + else + throw $this->createNotFoundException(); + $entityManager->persist($item); + $entityManager->flush(); + return $this->json(['result'=>1]); + } } diff --git a/hesabixCore/src/Controller/Front/AppController.php b/hesabixCore/src/Controller/Front/AppController.php index 66fac5c..ac84dea 100644 --- a/hesabixCore/src/Controller/Front/AppController.php +++ b/hesabixCore/src/Controller/Front/AppController.php @@ -31,68 +31,6 @@ class AppController extends AbstractController { return $this->render('/app/dashboard.html.twig'); } - /** - * @Route("/app/changes/list", name="app_front_changes_list") - */ - public function app_front_changes_list(EntityManagerInterface $entityManager): Response - { - return $this->render('/app/changes/list.html.twig',[ - 'items'=>$entityManager->getRepository(ChangeReport::class)->findAll() - ]); - } - /** - * @Route("/app/changes/delete/{id}", name="app_front_changes_delete") - */ - public function app_front_changes_delete(String $id,EntityManagerInterface $entityManager): Response - { - $item = $entityManager->getRepository(ChangeReport::class)->find($id); - if($item){ - $entityManager->remove($item); - $entityManager->flush(); - } - return $this->redirectToRoute('app_front_changes_list'); - } - /** - * @Route("/app/changes/new", name="app_front_changes_new") - */ - public function app_front_changes_new(Request $request,EntityManagerInterface $entityManager): Response - { - $change = new ChangeReport(); - $change->setDateSubmit(time()); - $form = $this->createForm(UpdateListType::class,$change,[]); - - $form->handleRequest($request); - if ($form->isSubmitted() && $form->isValid()) { - $entityManager->persist($change); - $entityManager->flush(); - return $this->redirectToRoute('app_front_changes_list'); - } - return $this->render('/app/changes/new.html.twig',[ - 'form'=>$form->createView() - ]); - } - - /** - * @Route("/app/changes/edit/{id}", name="app_front_changes_edit") - */ - public function app_front_changes_edit(string $id, Request $request,EntityManagerInterface $entityManager): Response - { - $change = $entityManager->getRepository(ChangeReport::class)->find($id); - if(!$change) - throw $this->createNotFoundException(); - $change->setDateSubmit(time()); - $form = $this->createForm(UpdateListType::class,$change,[]); - - $form->handleRequest($request); - if ($form->isSubmitted() && $form->isValid()) { - $entityManager->persist($change); - $entityManager->flush(); - return $this->redirectToRoute('app_front_changes_list'); - } - return $this->render('/app/changes/new.html.twig',[ - 'form'=>$form->createView() - ]); - } /** * @Route("/app/api/list", name="app_front_api_list") diff --git a/hesabixCore/templates/app/base.html.twig b/hesabixCore/templates/app/base.html.twig index c1485d0..a1bfae2 100644 --- a/hesabixCore/templates/app/base.html.twig +++ b/hesabixCore/templates/app/base.html.twig @@ -82,12 +82,6 @@ پیشخوان -
  • - - - گزارش تغییرات - -
  • diff --git a/hesabixCore/templates/app/changes/list.html.twig b/hesabixCore/templates/app/changes/list.html.twig deleted file mode 100644 index f1e51fe..0000000 --- a/hesabixCore/templates/app/changes/list.html.twig +++ /dev/null @@ -1,52 +0,0 @@ -{% extends "app/base.html.twig" %} -{% block title %}لیست تغییرات{% endblock %} -{% block body %} -
    -
    -

    - - فهرست تغییرات -

    -
    -
    - جدید -
    -
    -
    -
    - - - - - - - - - - - {% for index,item in items %} - - - - - - - {% endfor %} - -
    #تاریخنسخهعملیات
    {{ index + 1}} - {{ item.version }} - - {{ Jdate.jdate('Y/n/d',item.dateSubmit) }} - -
    - - - - - - -
    -
    -
    -
    -{% endblock %} \ No newline at end of file diff --git a/hesabixCore/templates/app/changes/new.html.twig b/hesabixCore/templates/app/changes/new.html.twig deleted file mode 100644 index 2e3d0b2..0000000 --- a/hesabixCore/templates/app/changes/new.html.twig +++ /dev/null @@ -1,27 +0,0 @@ -{% extends "app/base.html.twig" %} -{% block title %}لیست تغییر نسخه جدید{% endblock %} -{% block body %} -
    -
    -

    - - {{ block('title') }} -

    -
    -
    - بازگشت -
    -
    -
    -
    - {{ form_start(form) }} - {{ form_row(form.version,{'attr':{'class':'mb-2'}}) }} - {{ form_row(form.body,{'attr':{'class':'mb-2'}}) }} -
    - {{ form_widget(form.submit) }} - بازگشت -
    - {{ form_end(form) }} -
    -
    -{% endblock %} \ No newline at end of file