yogiedigital/cod-fe
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: improve formatting and consistency in DetailDevice and GeneratePdf components

Browse Source
This commit is contained in:
vinix
2025-12-12 15:53:29 +07:00
parent 96d6367dbd
commit 1f8ee62721
2 changed files with 29 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/pages/master/device/component/DetailDevice.jsx
View File

@@ -60,7 +60,10 @@ const DetailDevice = (props) => {
device_name: formData.device_name,
is_active: formData.is_active,
device_location: formData.device_location,
device_description: (formData.device_description && formData.device_description.trim() !== '') ? formData.device_description : ' ',
device_description:
formData.device_description && formData.device_description.trim() !== ''
? formData.device_description
: ' ',
ip_address: formData.ip_address,
brand_id: formData.brand_id,
listen_channel: formData.listen_channel,
@@ -184,7 +187,6 @@ const DetailDevice = (props) => {
defaultBorderColor: '#23A55A',
defaultHoverColor: '#23A55A',
defaultHoverBorderColor: '#23A55A',
defaultHoverColor: '#23A55A',
},
},
}}

51
src/pages/master/device/component/GeneratePdf.jsx
View File

@@ -1,4 +1,4 @@
import React, {useEffect, useState } from 'react';
import React, { useEffect, useState } from 'react';
import { Modal, Button, ConfigProvider } from 'antd';
import { jsPDF } from 'jspdf';
import logoPiEnergi from '../../../../assets/images/logo/pi-energi.png';
@@ -22,12 +22,12 @@ const GeneratePdf = (props) => {
};
const generatePdf = async () => {
const {images, title} = await kopReportPdf(logoPiEnergi, 'COLD WORK PERMIT');
const { images, title } = await kopReportPdf(logoPiEnergi, 'COLD WORK PERMIT');
const doc = new jsPDF({
orientation: "portrait",
unit: "mm",
format: "a4"
orientation: 'portrait',
unit: 'mm',
format: 'a4',
});
const width = 45;
@@ -45,32 +45,32 @@ const GeneratePdf = (props) => {
doc.setFontSize(11);
doc.setFont('helvetica', 'normal');
doc.setLineWidth(0.2);
doc.setLineWidth(0.2);
doc.line(10, 32, 200, 32);
doc.setLineWidth(0.6);
doc.setLineWidth(0.6);
doc.line(10, 32.8, 200, 32.8);
doc.text("Tanggal Pengajuan", 10, 42);
doc.text(":", 59, 42);
doc.text('Tanggal Pengajuan', 10, 42);
doc.text(':', 59, 42);
doc.text("Deskripsi Pekerjaan", 10, 48);
doc.text(":", 59, 48);
doc.text("No. Permit", 10, 54);
doc.text(":", 59, 54);
doc.text("Spesifik Lokasi", 120, 54);
doc.text(":", 160, 54);
doc.text('Deskripsi Pekerjaan', 10, 48);
doc.text(':', 59, 48);
doc.text("No. Order", 10, 60);
doc.text(":", 59, 60);
doc.text("Jum. Personil Terlihat", 120, 60);
doc.text(":", 160, 60);
doc.text('No. Permit', 10, 54);
doc.text(':', 59, 54);
doc.text('Spesifik Lokasi', 120, 54);
doc.text(':', 160, 54);
doc.text("Peralatan yang digunakan", 10, 66);
doc.text(":", 59, 66);
doc.text('No. Order', 10, 60);
doc.text(':', 59, 60);
doc.text('Jum. Personil Terlihat', 120, 60);
doc.text(':', 160, 60);
doc.text("Jenis APD yang digunakan", 10, 72);
doc.text(":", 59, 72);
doc.text('Peralatan yang digunakan', 10, 66);
doc.text(':', 59, 66);
doc.text('Jenis APD yang digunakan', 10, 72);
doc.text(':', 59, 72);
const blob = doc.output('blob');
const url = URL.createObjectURL(blob);
@@ -84,7 +84,7 @@ const GeneratePdf = (props) => {
return (
<Modal
width='60%'
width="60%"
title="Preview PDF"
open={props.showPdf}
// open={true}
@@ -101,7 +101,6 @@ const GeneratePdf = (props) => {
defaultBorderColor: '#23A55A',
defaultHoverColor: '#23A55A',
defaultHoverBorderColor: '#23A55A',
defaultHoverColor: '#23A55A',
},
},
}}