New rate model added
This commit is contained in:
@@ -257,18 +257,18 @@ class AbstractReportService:
|
||||
def laying_summary(self):
|
||||
f = self.filters()
|
||||
data = [
|
||||
("150 mm Pipe","RM",Laying.pipe_150_mm),
|
||||
("200 mm Pipe","RM",Laying.pipe_200_mm),
|
||||
("250 mm Pipe","RM",Laying.pipe_250_mm),
|
||||
("300 mm Pipe","RM",Laying.pipe_300_mm),
|
||||
("350 mm Pipe","RM",Laying.pipe_350_mm),
|
||||
("400 mm Pipe","RM",Laying.pipe_400_mm),
|
||||
("450 mm Pipe","RM",Laying.pipe_450_mm),
|
||||
("500 mm Pipe","RM",Laying.pipe_500_mm),
|
||||
("600 mm Pipe","RM",Laying.pipe_600_mm),
|
||||
("700 mm Pipe","RM",Laying.pipe_700_mm),
|
||||
("900 mm Pipe","RM",Laying.pipe_900_mm),
|
||||
("1200 mm Pipe","RM",Laying.pipe_1200_mm),
|
||||
("150 mm Dia","RM",Laying.pipe_150_mm),
|
||||
("200 mm Dia","RM",Laying.pipe_200_mm),
|
||||
("250 mm Dia","RM",Laying.pipe_250_mm),
|
||||
("300 mm Dia","RM",Laying.pipe_300_mm),
|
||||
("350 mm Dia","RM",Laying.pipe_350_mm),
|
||||
("400 mm Dia","RM",Laying.pipe_400_mm),
|
||||
("450 mm Dia","RM",Laying.pipe_450_mm),
|
||||
("500 mm Dia","RM",Laying.pipe_500_mm),
|
||||
("600 mm Dia","RM",Laying.pipe_600_mm),
|
||||
("700 mm Dia","RM",Laying.pipe_700_mm),
|
||||
("900 mm Dia","RM",Laying.pipe_900_mm),
|
||||
("1200 mm Dia","RM",Laying.pipe_1200_mm),
|
||||
]
|
||||
return self.make_summary(data, Laying, f)
|
||||
|
||||
|
||||
65
app/services/subcontractor_rate_service.py
Normal file
65
app/services/subcontractor_rate_service.py
Normal file
@@ -0,0 +1,65 @@
|
||||
from app.services.db_service import db
|
||||
from app.models.subcontractor_rate_model import SubcontractorRate
|
||||
|
||||
|
||||
class SubcontractorRateService:
|
||||
|
||||
@staticmethod
|
||||
def save_rate(form):
|
||||
|
||||
rate = SubcontractorRate(
|
||||
subcontractor_id=form.get("subcontractor_id"),
|
||||
category=form.get("category"),
|
||||
item_code=form.get("item_code"),
|
||||
item_name=form.get("item_name"),
|
||||
unit=form.get("unit"),
|
||||
rate=form.get("rate"),
|
||||
effective_from=form.get("effective_from"),
|
||||
effective_to=form.get("effective_to") or None,
|
||||
status=form.get("status")
|
||||
)
|
||||
|
||||
db.session.add(rate)
|
||||
db.session.commit()
|
||||
return rate
|
||||
|
||||
|
||||
@staticmethod
|
||||
def get_all_rates():
|
||||
|
||||
return (
|
||||
SubcontractorRate.query
|
||||
.order_by(SubcontractorRate.created_at.desc())
|
||||
.all()
|
||||
)
|
||||
@staticmethod
|
||||
def get_rate(rate_id):
|
||||
|
||||
return SubcontractorRate.query.get_or_404(rate_id)
|
||||
|
||||
@staticmethod
|
||||
def update_rate(rate_id, form):
|
||||
|
||||
rate = SubcontractorRate.query.get_or_404(rate_id)
|
||||
|
||||
rate.subcontractor_id = form.get("subcontractor_id")
|
||||
rate.category = form.get("category")
|
||||
rate.item_code = form.get("item_code")
|
||||
rate.item_name = form.get("item_name")
|
||||
rate.unit = form.get("unit")
|
||||
rate.rate = form.get("rate")
|
||||
rate.effective_from = form.get("effective_from")
|
||||
rate.effective_to = form.get("effective_to") or None
|
||||
rate.status = form.get("status")
|
||||
|
||||
db.session.commit()
|
||||
return rate
|
||||
|
||||
@staticmethod
|
||||
def delete_rate(rate_id):
|
||||
|
||||
rate = SubcontractorRate.query.get_or_404(rate_id)
|
||||
|
||||
db.session.delete(rate)
|
||||
|
||||
db.session.commit()
|
||||
Reference in New Issue
Block a user