35
35
SimpleSales2 ,
36
36
)
37
37
38
-
39
38
User = get_user_model ()
40
39
SUPER_LOGIN = dict (username = "superlogin" , password = "password" )
41
40
year = now ().year
@@ -278,7 +277,7 @@ def setUpTestData(cls):
278
277
price = 10 ,
279
278
flag = "sales-return" ,
280
279
)
281
- sale5 = ComplexSales .objects .create (
280
+ ComplexSales .objects .create (
282
281
doc_date = datetime .datetime (year , 3 , 2 ),
283
282
client = cls .client2 ,
284
283
product = cls .product1 ,
@@ -454,7 +453,7 @@ def test_view_filter_to_field_set(self):
454
453
)
455
454
self .assertEqual (response .status_code , 200 )
456
455
457
- view_report_data = response .json ()
456
+ response .json ()
458
457
self .assertTrue (len (data ), 2 )
459
458
# self.assertEqual(view_report_data['data'], data)
460
459
@@ -537,6 +536,7 @@ def test_view_filter(self):
537
536
columns = ["slug" , "name" ],
538
537
time_series_pattern = "monthly" ,
539
538
time_series_columns = ["__total__" , "__balance__" ],
539
+ kwargs_filters = {"client_id__in" : [self .client1 .pk , self .client2 .pk ]},
540
540
)
541
541
data = report_generator .get_report_data ()
542
542
response = self .client .get (
@@ -547,34 +547,31 @@ def test_view_filter(self):
547
547
HTTP_X_REQUESTED_WITH = "XMLHttpRequest" ,
548
548
)
549
549
self .assertEqual (response .status_code , 200 )
550
- view_report_data = response .json ()
551
550
self .assertTrue (len (data ), 2 )
552
- # self.assertEqual(view_report_data['data'], data)
551
+ view_report_data = response .json ()
552
+ self .assertEqual (view_report_data ["data" ], data )
553
553
554
554
def test_view_filter_to_field_set (self ):
555
555
report_generator = ReportGenerator (
556
556
report_model = SimpleSales2 ,
557
557
date_field = "doc_date" ,
558
558
group_by = "client" ,
559
559
columns = ["slug" , "name" ],
560
- # time_series_pattern="monthly",
561
- # time_series_columns=["__total__", "__balance__"],
560
+ time_series_pattern = "monthly" ,
561
+ time_series_columns = ["__total__" , "__balance__" ],
562
562
)
563
563
data = report_generator .get_report_data ()
564
564
response = self .client .get (
565
565
reverse ("report-to-field-set" ),
566
- # data={
567
- # "client_id": [self.client2.name, self.client1.name],
568
- # },
569
566
HTTP_X_REQUESTED_WITH = "XMLHttpRequest" ,
570
567
)
571
568
self .assertEqual (response .status_code , 200 )
572
569
573
570
self .assertTrue (len (data ), 2 )
574
571
575
- # view_report_data = response.json()
572
+ view_report_data = response .json ()
576
573
577
- # self.assertEqual(view_report_data[' data' ], data)
574
+ self .assertEqual (view_report_data [" data" ], data )
578
575
579
576
def test_ajax (self ):
580
577
report_generator = ReportGenerator (
0 commit comments