Browse Source

Merge pull request '[Refactor] Menghilangkan menu gantt pada projek multi location' (#13) from Dev-Fuad into staging

Reviewed-on: #13
staging
farhantock 2 months ago
parent
commit
557df6795a
  1. 2
      src/const/ApiConst.js
  2. 2
      src/views/SimproV2/CreatedProyek/index.js
  3. 4
      src/views/SimproV2/Gantt/GanttFrame.js

2
src/const/ApiConst.js

@ -121,7 +121,7 @@ export const TOKEN_ADW =
// export let BASE_OSPRO = "http://localhost:8444/adw-backend";
export let BASE_OSPRO = "https://si-api.ospro.id";
// export let BASE_OSPRO = "http://localhost:8444/surveyor_indonesia_backend";
// export let BASE_OSPRO = "http://localhost/surveyor_indonesia_backend";
// export let BASE_OSPRO = "http://103.73.125.81:8444"; // ip public adw
export let BASE_SIMPRO_LUMEN = `${BASE_OSPRO}/api`;
export let BASE_SIMPRO_LUMEN_IMAGE = `${BASE_OSPRO}/assets/image`;

2
src/views/SimproV2/CreatedProyek/index.js

@ -1554,12 +1554,14 @@ const CreatedProyek = ({ params, ...props }) => {
</span>
<span className="menu-text">Assign Checklist K3</span>
</div>
{text.join_second_is_multiLocation == false && (
<div className="menu-list" onClick={() => handleOpenDialogGantt(text)}>
<span className="menu-icon">
<i className="fa fa-bars"></i>
</span>
<span className="menu-text">Gantt</span>
</div>
)}
<div className="menu-list" onClick={() => handleSCurve(text)}>
<span className="menu-icon">
<i className="fa fa-line-chart"></i>

4
src/views/SimproV2/Gantt/GanttFrame.js

@ -5,8 +5,8 @@ import { BASE_SIMPRO_LUMEN } from '../../../const/ApiConst';
const GanttFrame = React.memo(({ versionGanttId, idProject, ro, timestamp, dataViewStartDate, token, role_name, ganttName }) => {
const history = useHistory();
// const iframeSrc = `https://si-gantt.ospro.id/edit-mode/index.html?base_url=${BASE_SIMPRO_LUMEN}&gantt_id=${versionGanttId}&proyek_id=${idProject}&token=${token}&ro=${ro}&timestamp=${timestamp}&start=${dataViewStartDate}&role_name=${role_name}&gantt_name=${ganttName}`;
const iframeSrc = `http://localhost:8444/surveyor_indonesia_gantt/edit-mode/index.html?base_url=${BASE_SIMPRO_LUMEN}&gantt_id=${versionGanttId}&proyek_id=${idProject}&token=${token}&ro=${ro}&timestamp=${timestamp}&start=${dataViewStartDate}&role_name=${role_name}&gantt_name=${ganttName}`;
const iframeSrc = `https://si-gantt.ospro.id/edit-mode/index.html?base_url=${BASE_SIMPRO_LUMEN}&gantt_id=${versionGanttId}&proyek_id=${idProject}&token=${token}&ro=${ro}&timestamp=${timestamp}&start=${dataViewStartDate}&role_name=${role_name}&gantt_name=${ganttName}`;
// const iframeSrc = `http://localhost/surveyor_indonesia_gantt/edit-mode/index.html?base_url=${BASE_SIMPRO_LUMEN}&gantt_id=${versionGanttId}&proyek_id=${idProject}&token=${token}&ro=${ro}&timestamp=${timestamp}&start=${dataViewStartDate}&role_name=${role_name}&gantt_name=${ganttName}`;
const [batchEntityData, setBatchEntityData] = useState(null);
useEffect(() => {

Loading…
Cancel
Save