pjpatil12/Comparison_Project
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Compare commits

merge into: pjpatil12:Laxmi-Devs
Branches Tags
pjpatil12:main pjpatil12:prajakta-devs pjpatil12:Laxmi-Devs pjpatil12:Laxmi pjpatil12:pankaj-dev pjpatil12:empty
...
pull from: pjpatil12:main
Branches Tags
pjpatil12:prajakta-devs pjpatil12:Laxmi-Devs pjpatil12:main pjpatil12:Laxmi pjpatil12:pankaj-dev pjpatil12:empty

10 Commits
Laxmi-Devs ... main

Author SHA1 Message Date
pjpatil12
de7b85034d replace 2026-08-06 13:39:13 +05:30
pjpatil12
2f99c290df Merge branch 'pankaj-dev' 2026-08-06 12:46:16 +05:30
Pankaj J Patil
5577576112 Update README.md 
update readme file
 2026-04-07 11:42:23 +00:00
Pankaj J Patil
ce0e4f90cf Merge pull request 'updateds folder path and regex' (#14) from pankaj-dev into main 
Reviewed-on: #14
 2026-03-18 04:51:41 +00:00
Pankaj J Patil
446778a50c Merge pull request 'pankaj-dev' (#13) from pankaj-dev into main 
Reviewed-on: #13
 2026-03-17 12:54:08 +00:00
Pankaj J Patil
310ab40bf9 Merge pull request 'dataase field updateds and model updateds' (#12) from pankaj-dev into main 
Reviewed-on: #12
 2026-03-11 08:04:07 +00:00
pjpatil12
bb56f00a6c Resolved merge conflicts 2026-02-28 16:59:24 +05:30
pjpatil12
8353bb6426 Merge branch 'pankaj-dev' 2026-02-28 16:55:19 +05:30
pjpatil12
1dceb640bd Merge pull request 'Dowload report of client report fix' (#10) from dev-anish into main 
Reviewed-on: #10
 2026-01-19 06:54:02 +00:00
anishd100
359847958d Dowload report of client report fix 2026-01-17 18:06:58 +05:30
3 changed files with 25 additions and 2 deletions
Expand all files Collapse all files

5
README.md
View File

@@ -36,7 +36,8 @@ The Comparison Project is designed to:
## Tech Stack ## Tech Stack
**Backend Framework**: Flask **Frontend Framework**: HTML, CSS, Js, Bootstrap
**Backend Framework**: Python Flask
**Database**: SQL Database (MySQL/PostgreSQL/SQLite configured via environment variables) **Database**: SQL Database (MySQL/PostgreSQL/SQLite configured via environment variables)
**ORM**: SQLAlchemy **ORM**: SQLAlchemy
**File Processing**: Pandas, OpenPyXL, XlsxWriter **File Processing**: Pandas, OpenPyXL, XlsxWriter
@@ -580,4 +581,4 @@ Open browser: `http://127.0.0.1:5000/`
For issues, feature requests, or contributions, please contact the development team. For issues, feature requests, or contributions, please contact the development team.
**Last Updated:** January 2026 **Last Updated:** April 2026

19
app/templates/client_report.html
View File

@@ -31,6 +31,24 @@
type="button">Tr.Ex </button> type="button">Tr.Ex </button>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<<<<<<< HEAD
<button class="nav-link" id="mh-tab" data-bs-toggle="tab" data-bs-target="#mh" type="button">Mh.Ex
</button>
</li>
<li class="nav-item">
<button class="nav-link" id="dc-tab" data-bs-toggle="tab" data-bs-target="#dc" type="button">MH & DC
</button>
</li>
<li class="nav-item">
<<<<<<< HEAD
<button class="nav-link" id="laying-tab" data-bs-toggle="tab" data-bs-target="#laying"
type="button">Laying
& Bedding Comparison</button>
=======
<button class="nav-link" id="laying-tab" data-bs-toggle="tab" data-bs-target="#laying" type="button">Laying
& Bedding </button>
>>>>>>> 1dceb640bd930c37888799f10f02fe90b219be67
=======
<button class="nav-link" id="mh-tab" data-bs-toggle="tab" data-bs-target="#mh" type="button"> <button class="nav-link" id="mh-tab" data-bs-toggle="tab" data-bs-target="#mh" type="button">
Mh.Ex</button> Mh.Ex</button>
</li> </li>
@@ -41,6 +59,7 @@
<li class="nav-item"> <li class="nav-item">
<button class="nav-link" id="laying-tab" data-bs-toggle="tab" data-bs-target="#laying"type="button"> <button class="nav-link" id="laying-tab" data-bs-toggle="tab" data-bs-target="#laying"type="button">
Laying & Bedding </button> Laying & Bedding </button>
>>>>>>> pankaj-dev
</ul> </ul>
<div class="tab-content mt-3" id="reportTabsContent"> <div class="tab-content mt-3" id="reportTabsContent">

3
logs/app.log
View File

@@ -0,0 +1,3 @@
2026-08-06 12:44:45 | INFO | User=System | IP=- | - | - | ======================================================================
2026-08-06 12:44:45 | INFO | User=System | IP=- | - | - | Application Started Successfully
2026-08-06 12:44:45 | INFO | User=System | IP=- | - | - | ======================================================================