From 061e3a80e0a309b9a20d3ff67991eb906492f5e0 Mon Sep 17 00:00:00 2001 From: Daeng Deni Mardaeni Date: Thu, 23 Nov 2023 13:47:10 +0700 Subject: [PATCH 1/4] update from server --- Http/Controllers/FrontendController.php | 6 +++--- Resources/views/cakupan.blade.php | 2 ++ Resources/views/ont.blade.php | 14 +++++++++++--- Resources/views/press-release.blade.php | 14 ++++++++++---- 4 files changed, 26 insertions(+), 10 deletions(-) diff --git a/Http/Controllers/FrontendController.php b/Http/Controllers/FrontendController.php index a4bd605..de7e648 100644 --- a/Http/Controllers/FrontendController.php +++ b/Http/Controllers/FrontendController.php @@ -43,7 +43,7 @@ $sheets = Sheets::spreadsheet('1c2Uv3QVTyLzsJPE4uqqlMGNKO8z0Kqj6aEGh0uixAqA') ->sheet('Platform') - ->range('A:F') + ->range('A:G') ->get(); $header = $sheets->pull(0); $posts = Sheets::collection($header, $sheets); @@ -78,7 +78,7 @@ $sheets = Sheets::spreadsheet('1c2Uv3QVTyLzsJPE4uqqlMGNKO8z0Kqj6aEGh0uixAqA') ->sheet('Platform') - ->range('A:F') + ->range('A:G') ->get(); $header = $sheets->pull(0); $posts = Sheets::collection($header, $sheets); @@ -118,7 +118,7 @@ $sheets = Sheets::spreadsheet('1c2Uv3QVTyLzsJPE4uqqlMGNKO8z0Kqj6aEGh0uixAqA') ->sheet('Platform') - ->range('A:F') + ->range('A:G') ->get(); $header = $sheets->pull(0); $posts = Sheets::collection($header, $sheets); diff --git a/Resources/views/cakupan.blade.php b/Resources/views/cakupan.blade.php index 8ea1fed..e1f5f5c 100644 --- a/Resources/views/cakupan.blade.php +++ b/Resources/views/cakupan.blade.php @@ -102,6 +102,7 @@ Platform Kategori Nama + Stok Harga @@ -119,6 +120,7 @@ $harga = str_replace('.00','',$harga); $harga = str_replace(',','',$harga); @endphp + {{ $row['Stok'] }} Rp {{ number_format($harga*($usd+($usd*0.05)),2,',','.') }} @php $no++; @endphp diff --git a/Resources/views/ont.blade.php b/Resources/views/ont.blade.php index 6da11b3..08810f6 100644 --- a/Resources/views/ont.blade.php +++ b/Resources/views/ont.blade.php @@ -5,10 +5,10 @@ - Kerjasama Penelitian Genomik Panin 2023 + ONT | Kerjasama Penelitian Genomik Panin 2023 - + @@ -16,7 +16,7 @@ - + @@ -61,6 +61,12 @@ :class="{'text-white bg-guardsman-red-700 rounded lg:bg-transparent lg:text-guardsman-red-700 dark:text-white' : activeMenu=='home'}" aria-current="page">Home +
  • + Press Release +
    • +
  • Platform Kategori Nama + Stok Harga @@ -143,6 +150,7 @@ $harga = str_replace('.00','',$harga); $harga = str_replace(',','',$harga); @endphp + {{ $row['Stok'] }} Rp {{ number_format($harga*($usd+($usd*0.05)),2,',','.') }} @php $no++; @endphp diff --git a/Resources/views/press-release.blade.php b/Resources/views/press-release.blade.php index 58e80da..ad2d87b 100644 --- a/Resources/views/press-release.blade.php +++ b/Resources/views/press-release.blade.php @@ -5,10 +5,10 @@ - Kerjasama Penelitian Genomik Panin 2023 + Press Release | Kerjasama Penelitian Genomik Panin 2023 - + @@ -16,7 +16,7 @@ - + @@ -54,13 +54,19 @@ diff --git a/Resources/views/index.blade.php b/Resources/views/index.blade.php index fd5c5c9..abee2b4 100644 --- a/Resources/views/index.blade.php +++ b/Resources/views/index.blade.php @@ -72,12 +72,13 @@ :class="{'text-white bg-guardsman-red-700 rounded lg:bg-transparent lg:text-guardsman-red-700 dark:text-white' : activeMenu=='facility'}">Sequencing Facility
  • - ONT + ONT
  • - PACBIO + PACBIO +
    • +
  • + PACBIO
    • @@ -249,7 +250,7 @@

    - Press Notice of Collaboration on Genomics Research by the Satriabudi Dharma Setia Foundation and PacBio + Press Notice of Collaboration on Genomics Research by the Satriabudi Dharma Setia Foundation and PacBio

    7 September 2023

    @@ -266,7 +267,7 @@

    - Press Notice of Collaboration on Genomics Research by The Satriabudi Dharma Setia Foundation and Oxford Nanopore Technologies + Press Notice of Collaboration on Genomics Research by The Satriabudi Dharma Setia Foundation and Oxford Nanopore Technologies

    27 Juni 2023

    @@ -278,6 +279,23 @@

    +
    + +
    + +
    +
    +

    + Yayasan Satriabudi Dharma Setia (YSDS) terus melakukan upaya untuk memajukan aksesibilitas teknologi genomik di Indonesia. Salah satunya, dengan mendukung produksi komponen-komponen penting dalam proses pemeriksaan genomik seperti sintesis oligonukleotida. +

    +
    +
    diff --git a/Resources/views/press-release-oligos.blade.php b/Resources/views/press-release-oligos.blade.php new file mode 100644 index 0000000..0122dde --- /dev/null +++ b/Resources/views/press-release-oligos.blade.php @@ -0,0 +1,159 @@ + + + + + + + + Press Release | Kerjasama Penelitian Genomik Panin 2023 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + +
    + +
    +
    + +
    +
    +

    Yayasan Satriabudi Dharma Setia Mendukung Proses Pembuatan Oligonucleotide Synthesizer Lokal

    + -Untuk Dikutip + + +

    + Jakarta, November 11th 2023 — Yayasan Satriabudi Dharma Setia (YSDS) terus melakukan upaya untuk memajukan aksesibilitas teknologi genomik di Indonesia. Salah satunya, dengan mendukung produksi komponen-komponen penting dalam proses pemeriksaan genomik seperti sintesis oligonukleotida +

    +

    + Sintesis oligonukleotida merupakan salah satu prosedur yang diperlukan dalam berbagai macam proses seperti riset biologi molekuler, pengembangan pengobatan dan aplikasi diagnostik. Prosedur ini belum tersedia secara luas di Indonesia. Kemandirian untuk mengerjakan prosedur ini di Indonesia diharapkan dapat dicapai dalam waktu dekat, sesuai misi YSDS untuk melakukan akselerasi teknologi genomik di Indonesia. +

    +

    + Kemandirian ini diharapkan dapat dicapai tidak hanya dengan menyiapkan peralatan yang diperlukan, namun seluruh ekosistem lengkap seperti kapasitas sumber daya manusia, keterbukaan akses teknologi oleh pengguna peralatan dan eksplorasi permintaan penggunaan untuk efisiensi produksi. +

    + +

    + YSDS menargetkan terciptanya lebih banyak kolaborasi antar institusi, salah satunya dalam bidang biologi sintetik, untuk meningkatkan kemampuan teknologi genomik di Indonesia. Untuk informasi lebih lanjut, dapat menghubungi: +

    + +

    + YSDS: dr. Vincentius SW Budhyanto; Ketua; Email: vincent@dharma.or.id; Telepon: +62 811-2555-252 +

    + -End of Notification +
    +
    +
    +
    + + +
    +
    +
    +

    Instruksi Pendaftaran

    +

    Informasi lebih lanjut dapat menghubungi kami melalui + omics@dharma.or.id atau menghubungi + 0895-3248-32922 (whatsapp). Skema ini terus dibuka sesuai dengan ketersediaan dana YSDS. +

    +
    +
    +
    +
    +
    + © 2022-2023 Yayasan Satriabudi Dharma Setia + + +
    +
    +
    + + + diff --git a/Resources/views/press-release.blade.php b/Resources/views/press-release.blade.php index ad2d87b..3a3d7f5 100644 --- a/Resources/views/press-release.blade.php +++ b/Resources/views/press-release.blade.php @@ -61,9 +61,10 @@ :class="{'text-white bg-guardsman-red-700 rounded lg:bg-transparent lg:text-guardsman-red-700 dark:text-white' : activeMenu=='home'}" aria-current="page">Home -
  • + +
  • Press Release
    • @@ -119,20 +120,22 @@ For more information about this partnership, please contact:

    - YSDS: dr. Vincentius SW Budhyanto; Position Chairperson; Email: vincent@dharma.or.id; Phone: +62 811-2555-252 + YSDS: dr. Vincentius SW Budhyanto; Position Chairperson; Email: + vincent@dharma.or.id; Phone: + +62 811-2555-252

    ONT: Position …; Email: …; Phone: …

    - About Company A: + About Satriabudi Dharma Setia Foundation (YSDS) :

    The Satriabudi Dharma Setia Foundation (YSDS) is a non-profit organization whose mission is to increase access to quality education and health for the people of Indonesia. YSDS has an acceleration program for genomic knowledge and technology in Indonesia, by providing access to affordable and transparent genome sequencing examinations for researchers in Indonesia. Information related to the genomic cooperation program can be accessed through the website genom.dharma.or.id.

    - About Company B: + About Oxford Nanopore Technologies :

    Oxford Nanopore Technologies is a leading biotechnology company specializing in the development and commercialization of innovative DNA and RNA sequencing technology. The company was founded in 2005 with the goal of revolutionizing genetic analysis by creating portable, real-time DNA sequencers that provide fast and cost-effective sequencing results. For the most up-to-date and comprehensive information about the company, please visit their official website: www.nanoporetech.com. diff --git a/Routes/web.php b/Routes/web.php index 28ae978..aeb7b16 100644 --- a/Routes/web.php +++ b/Routes/web.php @@ -15,6 +15,10 @@ if ($_ENV['APP_URL'] == 'https://ont.dharma.or.id') { Route::get('/', 'FrontendController@ont'); + Route::get('press-release', [FrontendController::class, 'press']); + } elseif ($_ENV['APP_URL'] == 'https://oligos.dharma.or.id') { + Route::get('/', 'FrontendController@oligos'); + Route::get('press-release', [FrontendController::class, 'oligos']); } else { Route::get('/', 'FrontendController@index'); } @@ -30,5 +34,3 @@ Route::get('SILX/ci', [FrontendController::class, 'silx_ci']); Route::get('SILX/ic', [FrontendController::class, 'silx_ic']); Route::get('cakupan', [FrontendController::class, 'cakupan']); - - Route::get('press-release', [FrontendController::class, 'press']); From 38a86da856c24e234f9a5b7ada519184725fb7d3 Mon Sep 17 00:00:00 2001 From: Daeng Deni Mardaeni Date: Thu, 23 Nov 2023 14:18:04 +0700 Subject: [PATCH 3/4] update menu --- Resources/views/facility.blade.php | 2 +- Resources/views/index.blade.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/views/facility.blade.php b/Resources/views/facility.blade.php index 713bc5b..8b93154 100644 --- a/Resources/views/facility.blade.php +++ b/Resources/views/facility.blade.php @@ -78,7 +78,7 @@ PACBIO

  • - PACBIO + OLIGOS
    • diff --git a/Resources/views/index.blade.php b/Resources/views/index.blade.php index abee2b4..557cd1e 100644 --- a/Resources/views/index.blade.php +++ b/Resources/views/index.blade.php @@ -78,7 +78,7 @@ PACBIO
  • - PACBIO + OLIGOS
    • From 94afb2d0ff3b9a426f11109a5b3c46ae4f12c308 Mon Sep 17 00:00:00 2001 From: Daeng Deni Mardaeni Date: Thu, 23 Nov 2023 14:30:07 +0700 Subject: [PATCH 4/4] update menu --- Resources/views/facility.blade.php | 2 +- Resources/views/index.blade.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/views/facility.blade.php b/Resources/views/facility.blade.php index 8b93154..1caa4ce 100644 --- a/Resources/views/facility.blade.php +++ b/Resources/views/facility.blade.php @@ -78,7 +78,7 @@ PACBIO
  • - OLIGOS + OLIGOS
    • diff --git a/Resources/views/index.blade.php b/Resources/views/index.blade.php index 557cd1e..dc9c632 100644 --- a/Resources/views/index.blade.php +++ b/Resources/views/index.blade.php @@ -78,7 +78,7 @@ PACBIO
  • - OLIGOS + OLIGOS